Commit 9bc61c04 authored by Guillaume Nault's avatar Guillaume Nault Committed by David S. Miller

net: Remove DECnet leftovers from flow.h.

DECnet was removed by commit 1202cdd6 ("Remove DECnet support from
kernel"). Let's also revome its flow structure.

Compile-tested only (allmodconfig).
Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eddb249
...@@ -54,11 +54,6 @@ union flowi_uli { ...@@ -54,11 +54,6 @@ union flowi_uli {
__u8 code; __u8 code;
} icmpt; } icmpt;
struct {
__le16 dport;
__le16 sport;
} dnports;
__be32 gre_key; __be32 gre_key;
struct { struct {
...@@ -156,27 +151,11 @@ struct flowi6 { ...@@ -156,27 +151,11 @@ struct flowi6 {
__u32 mp_hash; __u32 mp_hash;
} __attribute__((__aligned__(BITS_PER_LONG/8))); } __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 { struct flowi {
union { union {
struct flowi_common __fl_common; struct flowi_common __fl_common;
struct flowi4 ip4; struct flowi4 ip4;
struct flowi6 ip6; struct flowi6 ip6;
struct flowidn dn;
} u; } u;
#define flowi_oif u.__fl_common.flowic_oif #define flowi_oif u.__fl_common.flowic_oif
#define flowi_iif u.__fl_common.flowic_iif #define flowi_iif u.__fl_common.flowic_iif
...@@ -211,11 +190,6 @@ static inline struct flowi_common *flowi6_to_flowi_common(struct flowi6 *fl6) ...@@ -211,11 +190,6 @@ static inline struct flowi_common *flowi6_to_flowi_common(struct flowi6 *fl6)
return &(fl6->__fl_common); 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); __u32 __get_hash_from_flowi6(const struct flowi6 *fl6, struct flow_keys *keys);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment