Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[pandora-kernel.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index 8139257..7fe5a0f 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -50,24 +50,62 @@ union flowi_uli {
 
 struct flowi4 {
        struct flowi_common     __fl_common;
+#define flowi4_oif             __fl_common.flowic_oif
+#define flowi4_iif             __fl_common.flowic_iif
+#define flowi4_mark            __fl_common.flowic_mark
+#define flowi4_tos             __fl_common.flowic_tos
+#define flowi4_scope           __fl_common.flowic_scope
+#define flowi4_proto           __fl_common.flowic_proto
+#define flowi4_flags           __fl_common.flowic_flags
+#define flowi4_secid           __fl_common.flowic_secid
        __be32                  daddr;
        __be32                  saddr;
        union flowi_uli         uli;
+#define fl4_sport              uli.ports.sport
+#define fl4_dport              uli.ports.dport
+#define fl4_icmp_type          uli.icmpt.type
+#define fl4_icmp_code          uli.icmpt.code
+#define fl4_ipsec_spi          uli.spi
+#define fl4_mh_type            uli.mht.type
+#define fl4_gre_key            uli.gre_key
 };
 
 struct flowi6 {
        struct flowi_common     __fl_common;
+#define flowi6_oif             __fl_common.flowic_oif
+#define flowi6_iif             __fl_common.flowic_iif
+#define flowi6_mark            __fl_common.flowic_mark
+#define flowi6_tos             __fl_common.flowic_tos
+#define flowi6_scope           __fl_common.flowic_scope
+#define flowi6_proto           __fl_common.flowic_proto
+#define flowi6_flags           __fl_common.flowic_flags
+#define flowi6_secid           __fl_common.flowic_secid
        struct in6_addr         daddr;
        struct in6_addr         saddr;
        __be32                  flowlabel;
        union flowi_uli         uli;
+#define fl6_sport              uli.ports.sport
+#define fl6_dport              uli.ports.dport
+#define fl6_icmp_type          uli.icmpt.type
+#define fl6_icmp_code          uli.icmpt.code
+#define fl6_ipsec_spi          uli.spi
+#define fl6_mh_type            uli.mht.type
+#define fl6_gre_key            uli.gre_key
 };
 
 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
 };
 
 struct flowi {
@@ -85,31 +123,6 @@ struct flowi {
 #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
-#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)));
 
 static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)