summaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_helper.c
diff options
context:
space:
mode:
authorFlorian Westphal2016-05-06 00:51:49 +0200
committerPablo Neira Ayuso2016-05-06 11:50:01 +0200
commit0a93aaedc46af2c5feecfb1066d98bfb491ec0b8 (patch)
tree66c730e6537deccb35773c294ed0462aa2ebda72 /net/netfilter/nf_conntrack_helper.c
parentnetfilter: conntrack: make netns address part of expect hash (diff)
downloadkernel-qcow2-linux-0a93aaedc46af2c5feecfb1066d98bfb491ec0b8.tar.gz
kernel-qcow2-linux-0a93aaedc46af2c5feecfb1066d98bfb491ec0b8.tar.xz
kernel-qcow2-linux-0a93aaedc46af2c5feecfb1066d98bfb491ec0b8.zip
netfilter: conntrack: use a single expectation table for all namespaces
We already include netns address in the hash and compare the netns pointers during lookup, so even if namespaces have overlapping addresses entries will be spread across the expectation table. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_helper.c')
-rw-r--r--net/netfilter/nf_conntrack_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index cb48e6adba2c..f703adb7e5f7 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -400,7 +400,7 @@ static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me,
spin_lock_bh(&nf_conntrack_expect_lock);
for (i = 0; i < nf_ct_expect_hsize; i++) {
hlist_for_each_entry_safe(exp, next,
- &net->ct.expect_hash[i], hnode) {
+ &nf_ct_expect_hash[i], hnode) {
struct nf_conn_help *help = nfct_help(exp->master);
if ((rcu_dereference_protected(
help->helper,