aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2013-07-29 09:41:55 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2013-08-09 06:03:33 -0400
commitc655bc6896b94ee0223393f26155c6daf1e2d148 (patch)
tree493664303eefd739303a67b891c0f7f89c92eb09 /net/ipv6
parent54e35cc52346149a7bce8a2f622e215ed17bb56d (diff)
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/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6t_MASQUERADE.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6t_MASQUERADE.c b/net/ipv6/netfilter/ip6t_MASQUERADE.c
index 47bff6107519..3e4e92d5e157 100644
--- a/net/ipv6/netfilter/ip6t_MASQUERADE.c
+++ b/net/ipv6/netfilter/ip6t_MASQUERADE.c
@@ -76,7 +76,7 @@ static int masq_device_event(struct notifier_block *this,
76 76
77 if (event == NETDEV_DOWN) 77 if (event == NETDEV_DOWN)
78 nf_ct_iterate_cleanup(net, device_cmp, 78 nf_ct_iterate_cleanup(net, device_cmp,
79 (void *)(long)dev->ifindex); 79 (void *)(long)dev->ifindex, 0, 0);
80 80
81 return NOTIFY_DONE; 81 return NOTIFY_DONE;
82} 82}