[PATCH net-next] net: Remove DECnet leftovers from flow.h.

[PATCH net-next] net: Remove DECnet leftovers from flow.h.

[Guillaume Nault]

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>
---
 include/net/flow.h | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/include/net/flow.h b/include/net/flow.h
index 987bd511d652..2f0da4f0318b 100644
--- 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		gre_key;
 
 	struct {
@@ -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
@@ -211,11 +190,6 @@ static inline struct flowi_common *flowi6_to_flowi_common(struct flowi6 *fl6)
 	return &(fl6->__fl_common);
 }
 
-static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn)
-{
-	return container_of(fldn, struct flowi, u.dn);
-}
-
 __u32 __get_hash_from_flowi6(const struct flowi6 *fl6, struct flow_keys *keys);
 
 #endif
-- 
2.21.3

Re: [PATCH net-next] net: Remove DECnet leftovers from flow.h.

[Stephen Hemminger]

On Fri, 30 Sep 2022 16:37:30 +0200
Guillaume Nault <gnault@redhat.com> wrote:

> 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>

Re: [PATCH net-next] net: Remove DECnet leftovers from flow.h.

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

On Fri, 30 Sep 2022 16:37:30 +0200 you wrote:
> 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>
> 
> [...]

Here is the summary with links:
  - [net-next] net: Remove DECnet leftovers from flow.h.
    https://git.kernel.org/netdev/net-next/c/9bc61c04ff6c

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html