Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[linux-2.6-block.git] / include / net / netns / xfrm.h

diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index 1006a265beb393a0ab917eb8315f0fb258c39e0a..3492434baf88e9dffb3da763de75db36480d9eb9 100644 (file)
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -6,6 +6,7 @@
 #include <linux/workqueue.h>
 #include <linux/xfrm.h>
 #include <net/dst_ops.h>
+#include <net/flowcache.h>
 
 struct ctl_table_header;
 
@@ -58,9 +59,17 @@ struct netns_xfrm {
        struct dst_ops          xfrm6_dst_ops;
 #endif
        spinlock_t xfrm_state_lock;
-       spinlock_t xfrm_policy_sk_bundle_lock;
        rwlock_t xfrm_policy_lock;
        struct mutex xfrm_cfg_mutex;
+
+       /* flow cache part */
+       struct flow_cache       flow_cache_global;
+       atomic_t                flow_cache_genid;
+       struct list_head        flow_cache_gc_list;
+       spinlock_t              flow_cache_gc_lock;
+       struct work_struct      flow_cache_gc_work;
+       struct work_struct      flow_cache_flush_work;
+       struct mutex            flow_flush_sem;
 };
 
 #endif