diff options
author | Florian Westphal <fw@strlen.de> | 2016-05-09 16:24:32 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-05-09 16:45:50 +0200 |
commit | 0c5366b3a8c77fd6d67b763c5a76dfdc314e7726 (patch) | |
tree | 826613743b403f926cc2eb52378b902709a27d5c /include/net/netns | |
parent | a76ae1c85576b4b833a506925417d746bc839302 (diff) | |
download | linux-stable-0c5366b3a8c77fd6d67b763c5a76dfdc314e7726.tar.gz linux-stable-0c5366b3a8c77fd6d67b763c5a76dfdc314e7726.tar.bz2 linux-stable-0c5366b3a8c77fd6d67b763c5a76dfdc314e7726.zip |
netfilter: conntrack: use single slab cache
An earlier patch changed lookup side to also net_eq() namespaces after
obtaining a reference on the conntrack, so a single kmemcache can be used.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netns')
-rw-r--r-- | include/net/netns/conntrack.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h index 1e751bf176fa..38b1a80517f0 100644 --- 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,7 +92,6 @@ struct netns_ct { int sysctl_tstamp; int sysctl_checksum; - struct kmem_cache *nf_conntrack_cachep; struct ct_pcpu __percpu *pcpu_lists; struct ip_conntrack_stat __percpu *stat; struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb; |