net: remove obsolete members from struct net

all have been moved to generic_net infra. On x86_64, this reduces
struct net size from 70 to 63 cache lines (4480 to 4032 byte).

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index dcaee24a4d8773ff3bb2adbe5fe9136dfc186184..fdb16dc337038692e687fb1ea929186c588c9fcb 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -142,15 +142,6 @@ struct net {
 #if defined(CONFIG_NF_TABLES) || defined(CONFIG_NF_TABLES_MODULE)
        struct netns_nftables   nft;
 #endif
-#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
-       struct netns_nf_frag    nf_frag;
-       struct ctl_table_header *nf_frag_frags_hdr;
-#endif
-       struct sock             *nfnl;
-       struct sock             *nfnl_stash;
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
-       struct list_head        nfct_timeout_list;
-#endif
 #endif
 #ifdef CONFIG_WEXT_CORE
        struct sk_buff_head     wext_nlevents;

diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 806454e767bf422893a523eebf96b67d38a532cb..e5f664d69ead5ae3fedf16a1d97d171d5d25e5b8 100644 (file)
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -96,13 +96,9 @@ struct netns_ct {
        atomic_t                count;
        unsigned int            expect_count;
 #ifdef CONFIG_NF_CONNTRACK_EVENTS
-       struct delayed_work ecache_dwork;
        bool ecache_dwork_pending;
 #endif
        bool                    auto_assign_helper_warned;
-#ifdef CONFIG_SYSCTL
-       struct ctl_table_header *sysctl_header;
-#endif
        unsigned int            sysctl_log_invalid; /* Log invalid packets */
        int                     sysctl_events;
        int                     sysctl_acct;

diff --git a/include/net/netns/netfilter.h b/include/net/netns/netfilter.h
index ca043342c0ebef269a0c96a7d82197889bb56f0f..15e2b13fb0c0fd2790fa62d82d3101ca350abf1c 100644 (file)
--- a/include/net/netns/netfilter.h
+++ b/include/net/netns/netfilter.h
@@ -28,11 +28,5 @@ struct netns_nf {
 #if IS_ENABLED(CONFIG_DECNET)
        struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS];
 #endif
-#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)
-       bool                    defrag_ipv4;
-#endif
-#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
-       bool                    defrag_ipv6;
-#endif
 };
 #endif

diff --git a/include/net/netns/nftables.h b/include/net/netns/nftables.h
index 6c0806bd8d1e636579a92796965936b872bc8dbc..8c77832d024041c02ee2c38e0c7951d5c56eefda 100644 (file)
--- a/include/net/netns/nftables.h
+++ b/include/net/netns/nftables.h
@@ -5,14 +5,7 @@
 #include <linux/list.h>
 
 struct netns_nftables {
-       struct list_head        tables;
-       struct list_head        commit_list;
-       struct list_head        module_list;
-       struct list_head        notify_list;
-       struct mutex            commit_mutex;
-       unsigned int            base_seq;
        u8                      gencursor;
-       u8                      validate_state;
 };
 
 #endif

diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
index 9bc5a12fdbb06df2c6768ab28ba6e681c645e588..83c8ea2e87a68652516dd62d9ac26e8f9947adda 100644 (file)
--- a/include/net/netns/x_tables.h
+++ b/include/net/netns/x_tables.h
@@ -8,7 +8,6 @@
 struct ebt_table;
 
 struct netns_xt {
-       struct list_head tables[NFPROTO_NUMPROTO];
        bool notrack_deprecated_warning;
        bool clusterip_deprecated_warning;
 #if defined(CONFIG_BRIDGE_NF_EBTABLES) || \