summaryrefslogtreecommitdiffstats
path: root/include/net/flow.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-12 00:44:35 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-12 15:08:46 -0800
commit56bb8059e1a8bf291054c26367564dc302f6fd8f (patch)
tree56ec5ae2c1856208ccf97a0cd6b21ab0587f34cf /include/net/flow.h
parent6281dcc94a96bd73017b2baa8fa83925405109ef (diff)
net: Break struct flowi out into AF specific instances.
Now we have struct flowi4, flowi6, and flowidn for each address family. And struct flowi is just a union of them all. It might have been troublesome to convert flow_cache_uli_match() but as it turns out this function is completely unused and therefore can be simply removed. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/flow.h')
-rw-r--r--include/net/flow.h114
1 files changed, 57 insertions, 57 deletions
diff --git a/include/net/flow.h b/include/net/flow.h
index f19f41d7daf..931169095cc 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -48,61 +48,68 @@ union flowi_uli {
} mht;
};
-struct flowi {
+struct flowi4 {
+ struct flowi_common __fl_common;
+ __be32 daddr;
+ __be32 saddr;
+ union flowi_uli uli;
+};
+
+struct flowi6 {
struct flowi_common __fl_common;
-#define flowi_oif __fl_common.flowic_oif
-#define flowi_iif __fl_common.flowic_iif
-#define flowi_mark __fl_common.flowic_mark
-#define flowi_tos __fl_common.flowic_tos
-#define flowi_scope __fl_common.flowic_scope
-#define flowi_proto __fl_common.flowic_proto
-#define flowi_flags __fl_common.flowic_flags
-#define flowi_secid __fl_common.flowic_secid
+ struct in6_addr daddr;
+ struct in6_addr saddr;
+ __be32 flowlabel;
+ union flowi_uli uli;
+};
+struct flowidn {
+ struct flowi_common __fl_common;
+ __le16 daddr;
+ __le16 saddr;
+ union flowi_uli uli;
+};
+
+struct flowi {
union {
- struct {
- __be32 daddr;
- __be32 saddr;
- } ip4_u;
-
- struct {
- struct in6_addr daddr;
- struct in6_addr saddr;
- __be32 flowlabel;
- } ip6_u;
-
- struct {
- __le16 daddr;
- __le16 saddr;
- __u8 scope;
- } dn_u;
- } nl_u;
-#define fld_dst nl_u.dn_u.daddr
-#define fld_src nl_u.dn_u.saddr
-#define fld_scope nl_u.dn_u.scope
-#define fl6_dst nl_u.ip6_u.daddr
-#define fl6_src nl_u.ip6_u.saddr
-#define fl6_flowlabel nl_u.ip6_u.flowlabel
-#define fl4_dst nl_u.ip4_u.daddr
-#define fl4_src nl_u.ip4_u.saddr
+ 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
+#define flowi_mark u.__fl_common.flowic_mark
+#define flowi_tos u.__fl_common.flowic_tos
+#define flowi_scope u.__fl_common.flowic_scope
+#define flowi_proto u.__fl_common.flowic_proto
+#define flowi_flags u.__fl_common.flowic_flags
+#define flowi_secid u.__fl_common.flowic_secid
#define fl4_tos flowi_tos
#define fl4_scope flowi_scope
-
- union flowi_uli uli_u;
-#define fl4_sport uli_u.ports.sport
-#define fl4_dport uli_u.ports.dport
-#define fl4_icmp_type uli_u.icmpt.type
-#define fl4_icmp_code uli_u.icmpt.code
-#define fl4_ipsec_spi uli_u.spi
-#define fl4_mh_type uli_u.mht.type
-#define fl4_gre_key uli_u.gre_key
-#define fl6_sport uli_u.ports.sport
-#define fl6_dport uli_u.ports.dport
-#define fl6_icmp_type uli_u.icmpt.type
-#define fl6_icmp_code uli_u.icmpt.code
-#define fl6_ipsec_spi uli_u.spi
-#define fl6_mh_type uli_u.mht.type
-#define fl6_gre_key uli_u.gre_key
+#define fld_scope flowi_scope
+
+#define fld_dst u.dn.daddr
+#define fld_src u.dn.saddr
+#define fl6_dst u.ip6.daddr
+#define fl6_src u.ip6.saddr
+#define fl6_flowlabel u.ip6.flowlabel
+#define fl4_dst u.ip4.daddr
+#define fl4_src u.ip4.saddr
+#define fl4_sport u.ip4.uli.ports.sport
+#define fl4_dport u.ip4.uli.ports.dport
+#define fl4_icmp_type u.ip4.uli.icmpt.type
+#define fl4_icmp_code u.ip4.uli.icmpt.code
+#define fl4_ipsec_spi u.ip4.uli.spi
+#define fl4_mh_type u.ip4.uli.mht.type
+#define fl4_gre_key u.ip4.uli.gre_key
+#define fl6_sport u.ip6.uli.ports.sport
+#define fl6_dport u.ip6.uli.ports.dport
+#define fl6_icmp_type u.ip6.uli.icmpt.type
+#define fl6_icmp_code u.ip6.uli.icmpt.code
+#define fl6_ipsec_spi u.ip6.uli.spi
+#define fl6_mh_type u.ip6.uli.mht.type
+#define fl6_gre_key u.ip6.uli.gre_key
} __attribute__((__aligned__(BITS_PER_LONG/8)));
#define FLOW_DIR_IN 0
@@ -134,11 +141,4 @@ extern struct flow_cache_object *flow_cache_lookup(
extern void flow_cache_flush(void);
extern atomic_t flow_cache_genid;
-static inline int flow_cache_uli_match(const struct flowi *fl1,
- const struct flowi *fl2)
-{
- return (fl1->flowi_proto == fl2->flowi_proto &&
- !memcmp(&fl1->uli_u, &fl2->uli_u, sizeof(fl1->uli_u)));
-}
-
#endif