Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-debug-fixes'

[deliverable/linux.git] / include / net / netns / conntrack.h

diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 723b61c82b3f444aee0e7591b8028cb2548e228e..38b1a80517f07152a25a1784bb95b637a9376ffd 100644 (file)
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -84,7 +84,6 @@ struct netns_ct {
        struct ctl_table_header *event_sysctl_header;
        struct ctl_table_header *helper_sysctl_header;
 #endif
-       char                    *slabname;
        unsigned int            sysctl_log_invalid; /* Log invalid packets */
        int                     sysctl_events;
        int                     sysctl_acct;
@@ -93,11 +92,6 @@ struct netns_ct {
        int                     sysctl_tstamp;
        int                     sysctl_checksum;
 
-       unsigned int            htable_size;
-       seqcount_t              generation;
-       struct kmem_cache       *nf_conntrack_cachep;
-       struct hlist_nulls_head *hash;
-       struct hlist_head       *expect_hash;
        struct ct_pcpu __percpu *pcpu_lists;
        struct ip_conntrack_stat __percpu *stat;
        struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb;
@@ -107,9 +101,5 @@ struct netns_ct {
        unsigned int            labels_used;
        u8                      label_words;
 #endif
-#ifdef CONFIG_NF_NAT_NEEDED
-       struct hlist_head       *nat_bysource;
-       unsigned int            nat_htable_size;
-#endif
 };
 #endif