ALSA: usb-audio: add support for Akai MPD16

[safe/jmp/linux-2.6] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index f3cc1f8..809970b 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -48,7 +48,7 @@ struct flowi {
 
        __u8    proto;
        __u8    flags;
-#define FLOWI_FLAG_MULTIPATHOLDROUTE 0x01
+#define FLOWI_FLAG_ANYSRC 0x01
        union {
                struct {
                        __be16  sport;
@@ -67,20 +67,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)));
 
@@ -88,12 +84,13 @@ struct flowi {
 #define FLOW_DIR_OUT   1
 #define FLOW_DIR_FWD   2
 
+struct net;
 struct sock;
-typedef int (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
-                              void **objp, atomic_t **obj_refp);
+typedef int (*flow_resolve_t)(struct net *net, struct flowi *key, u16 family,
+                             u8 dir, void **objp, atomic_t **obj_refp);
 
-extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
-                              flow_resolve_t resolver);
+extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
+                              u8 dir, flow_resolve_t resolver);
 extern void flow_cache_flush(void);
 extern atomic_t flow_cache_genid;