Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index f3cc1f8126190d38e72d50157a98d9e1d17e7f1c..228b2477ceecde908e699c31d47efc247181bd3f 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -47,8 +47,6 @@ struct flowi {
 #define fl4_scope      nl_u.ip4_u.scope
 
        __u8    proto;
-       __u8    flags;
-#define FLOWI_FLAG_MULTIPATHOLDROUTE 0x01
        union {
                struct {
                        __be16  sport;
@@ -67,20 +65,16 @@ struct flowi {
 
                __be32          spi;
 
-#ifdef CONFIG_IPV6_MIP6
                struct {
                        __u8    type;
                } mht;
-#endif
        } uli_u;
 #define fl_ip_sport    uli_u.ports.sport
 #define fl_ip_dport    uli_u.ports.dport
 #define fl_icmp_type   uli_u.icmpt.type
 #define fl_icmp_code   uli_u.icmpt.code
 #define fl_ipsec_spi   uli_u.spi
-#ifdef CONFIG_IPV6_MIP6
 #define fl_mh_type     uli_u.mht.type
-#endif
        __u32           secid;  /* used by xfrm; see secid.txt */
 } __attribute__((__aligned__(BITS_PER_LONG/8)));