1 files changed, 19 insertions, 7 deletions

diff --git a/include/net/flow.h b/include/net/flow.h
index 04d89f763451..ddf5f3ca1720 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -16,8 +16,8 @@ struct flowi {
 
         union {
                 struct {
-                        __u32                   daddr;
-                        __u32                   saddr;
+                        __be32                  daddr;
+                        __be32                  saddr;
                         __u32                   fwmark;
                         __u8                    tos;
                         __u8                    scope;
@@ -26,6 +26,7 @@ struct flowi {
                 struct {
                         struct in6_addr         daddr;
                         struct in6_addr         saddr;
+                        __u32                   fwmark;
                         __u32                   flowlabel;
                 } ip6_u;
 
@@ -42,6 +43,7 @@ struct flowi {
 #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_fwmark      nl_u.ip6_u.fwmark
 #define fl6_flowlabel   nl_u.ip6_u.flowlabel
 #define fl4_dst         nl_u.ip4_u.daddr
 #define fl4_src         nl_u.ip4_u.saddr
@@ -54,8 +56,8 @@ struct flowi {
 #define FLOWI_FLAG_MULTIPATHOLDROUTE 0x01
         union {
                 struct {
-                        __u16   sport;
-                        __u16   dport;
+                        __be16  sport;
+                        __be16  dport;
                 } ports;
 
                 struct {
@@ -71,13 +73,23 @@ struct flowi {
                         __u8    objname[16]; /* Not zero terminated */
                 } dnports;
 
-                __u32           spi;
+                __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)));
 
 #define FLOW_DIR_IN     0
@@ -85,10 +97,10 @@ struct flowi {
 #define FLOW_DIR_FWD    2
 
 struct sock;
-typedef void (*flow_resolve_t)(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+typedef void (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
                                void **objp, atomic_t **obj_refp);
 
-extern void *flow_cache_lookup(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
                                flow_resolve_t resolver);
 extern void flow_cache_flush(void);
 extern atomic_t flow_cache_genid;