netns xfrm: per-netns xfrm_state_hmask

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

diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index edf8471..f4498a6 100644 (file)
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -1,9 +1,30 @@
 #ifndef __NETNS_CONNTRACK_H
 #define __NETNS_CONNTRACK_H
 
+#include <linux/list.h>
 #include <asm/atomic.h>
 
+struct ctl_table_header;
+struct nf_conntrack_ecache;
+
 struct netns_ct {
        atomic_t                count;
+       unsigned int            expect_count;
+       struct hlist_head       *hash;
+       struct hlist_head       *expect_hash;
+       struct hlist_head       unconfirmed;
+       struct ip_conntrack_stat *stat;
+#ifdef CONFIG_NF_CONNTRACK_EVENTS
+       struct nf_conntrack_ecache *ecache;
+#endif
+       int                     sysctl_acct;
+       int                     sysctl_checksum;
+       unsigned int            sysctl_log_invalid; /* Log invalid packets */
+#ifdef CONFIG_SYSCTL
+       struct ctl_table_header *sysctl_header;
+       struct ctl_table_header *acct_sysctl_header;
+#endif
+       int                     hash_vmalloc;
+       int                     expect_vmalloc;
 };
 #endif