summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2013-07-29 15:41:55 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-08-09 12:03:33 +0200
commitc655bc6896b94ee0223393f26155c6daf1e2d148 (patch)
tree493664303eefd739303a67b891c0f7f89c92eb09 /net/ipv4
parent54e35cc52346149a7bce8a2f622e215ed17bb56d (diff)
downloadlinux-c655bc6896b94ee0223393f26155c6daf1e2d148.tar.gz
linux-c655bc6896b94ee0223393f26155c6daf1e2d148.tar.bz2
linux-c655bc6896b94ee0223393f26155c6daf1e2d148.zip
netfilter: nf_conntrack: don't send destroy events from iterator
Let nf_ct_delete handle delivery of the DESTROY event. Based on earlier patch from Pablo Neira. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter/ipt_MASQUERADE.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index 30e4de940567..00352ce0f0de 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -118,7 +118,7 @@ static int masq_device_event(struct notifier_block *this,
NF_CT_ASSERT(dev->ifindex != 0);
nf_ct_iterate_cleanup(net, device_cmp,
- (void *)(long)dev->ifindex);
+ (void *)(long)dev->ifindex, 0, 0);
}
return NOTIFY_DONE;