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

[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 b767683..d4958d4 100644 (file)
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -1,11 +1,35 @@
 #ifndef __NETNS_CONNTRACK_H
 #define __NETNS_CONNTRACK_H
 
+#include <linux/list.h>
+#include <linux/list_nulls.h>
 #include <asm/atomic.h>
 
+struct ctl_table_header;
+struct nf_conntrack_ecache;
+
 struct netns_ct {
        atomic_t                count;
-       struct hlist_head       *hash;
+       unsigned int            expect_count;
+       unsigned int            htable_size;
+       struct kmem_cache       *nf_conntrack_cachep;
+       struct hlist_nulls_head *hash;
+       struct hlist_head       *expect_hash;
+       struct hlist_nulls_head unconfirmed;
+       struct hlist_nulls_head dying;
+       struct ip_conntrack_stat __percpu *stat;
+       int                     sysctl_events;
+       unsigned int            sysctl_events_retry_timeout;
+       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;
+       struct ctl_table_header *event_sysctl_header;
+#endif
        int                     hash_vmalloc;
+       int                     expect_vmalloc;
+       char                    *slabname;
 };
 #endif