net: Remove DECnet leftovers from flow.h.

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>

diff --git a/include/net/flow.h b/include/net/flow.h
index 987bd511d6524288deaede100cfc155048d6071f..2f0da4f0318b580051c0fec2b98f745190c62cce 100644 (file)
--- 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