drop queue-5.4/net-remove-decnet-leftovers-from-flow.h.patch

diff --git a/queue-5.4/net-remove-decnet-leftovers-from-flow.h.patch b/queue-5.4/net-remove-decnet-leftovers-from-flow.h.patch
deleted file mode 100644 (file)
index 604bb13..0000000
--- a/queue-5.4/net-remove-decnet-leftovers-from-flow.h.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 9bc61c04ff6cce6a3756b86e6b34914f7b39d734 Mon Sep 17 00:00:00 2001
-From: Guillaume Nault <gnault@redhat.com>
-Date: Fri, 30 Sep 2022 16:37:30 +0200
-Subject: net: Remove DECnet leftovers from flow.h.
-
-From: Guillaume Nault <gnault@redhat.com>
-
-commit 9bc61c04ff6cce6a3756b86e6b34914f7b39d734 upstream.
-
-DECnet was removed by commit 1202cdd66531 ("Remove DECnet support from
-kernel"). Let's also revome its flow structure.
-
-Compile-tested only (allmodconfig).
-
-Signed-off-by: Guillaume Nault <gnault@redhat.com>
-Acked-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/net/flow.h |   26 --------------------------
- 1 file changed, 26 deletions(-)
-
---- a/include/net/flow.h
-+++ b/include/net/flow.h
-@@ -54,11 +54,6 @@ union flowi_uli {
-               __u8    code;
-       } icmpt;
- 
--      struct {
--              __le16  dport;
--              __le16  sport;
--      } dnports;
--
-       __be32          spi;
-       __be32          gre_key;
- 
-@@ -156,27 +151,11 @@ struct flowi6 {
-       __u32                   mp_hash;
- } __attribute__((__aligned__(BITS_PER_LONG/8)));
- 
--struct flowidn {
--      struct flowi_common     __fl_common;
--#define flowidn_oif           __fl_common.flowic_oif
--#define flowidn_iif           __fl_common.flowic_iif
--#define flowidn_mark          __fl_common.flowic_mark
--#define flowidn_scope         __fl_common.flowic_scope
--#define flowidn_proto         __fl_common.flowic_proto
--#define flowidn_flags         __fl_common.flowic_flags
--      __le16                  daddr;
--      __le16                  saddr;
--      union flowi_uli         uli;
--#define fld_sport             uli.ports.sport
--#define fld_dport             uli.ports.dport
--} __attribute__((__aligned__(BITS_PER_LONG/8)));
--
- struct flowi {
-       union {
-               struct flowi_common     __fl_common;
-               struct flowi4           ip4;
-               struct flowi6           ip6;
--              struct flowidn          dn;
-       } u;
- #define flowi_oif     u.__fl_common.flowic_oif
- #define flowi_iif     u.__fl_common.flowic_iif
-@@ -200,11 +179,6 @@ static inline struct flowi *flowi6_to_fl
-       return container_of(fl6, struct flowi, u.ip6);
- }
- 
--static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn)
--{
--      return container_of(fldn, struct flowi, u.dn);
--}
--
- typedef unsigned long flow_compare_t;
- 
- static inline unsigned int flow_key_size(u16 family)

diff --git a/queue-5.4/series b/queue-5.4/series
index 9cf2d8294c407dcc686a323cccdde7c7b988fde6..c6bc3cc7c77fd07f3e33e0385cedace222378143 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -60,6 +60,5 @@ selftests-ptp-fix-timestamp-printf-format-for-ptp_sy.patch
 afs-fix-vlserver-probe-rtt-handling.patch
 neighbour-remove-unused-inline-function-neigh_key_eq16.patch
 net-remove-unused-inline-function-dst_hold_and_use.patch
-net-remove-decnet-leftovers-from-flow.h.patch
 neighbour-delete-neigh_lookup_nodev-as-not-used.patch
 drm-nouveau-kms-fix-null-pointer-dereference-in-nouveau_connector_detect_depth.patch