diff options
| author | Florian Westphal <fw@strlen.de> | 2017-05-21 12:52:55 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-05-29 12:46:08 +0200 |
| commit | 9fd6452d67fb2acda12e5914e2ad371f067f3465 (patch) | |
| tree | 10a6c1890a67707717e8e577e8d95fc0b522aa6f /net/netfilter/nf_nat_core.c | |
| parent | cad4394453bd83ac7e82cad94c71149960a93f1a (diff) | |
| download | linux-9fd6452d67fb2acda12e5914e2ad371f067f3465.tar.gz | |
netfilter: conntrack: rename nf_ct_iterate_cleanup
There are several places where we needlesly call nf_ct_iterate_cleanup,
we should instead iterate the full table at module unload time.
This is a leftover from back when the conntrack table got duplicated
per net namespace.
So rename nf_ct_iterate_cleanup to nf_ct_iterate_cleanup_net.
A later patch will then add a non-net variant.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_nat_core.c')
| -rw-r--r-- | net/netfilter/nf_nat_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index ef0be325a0c63..daf5b22c07f84 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -586,7 +586,7 @@ static void nf_nat_l4proto_clean(u8 l3proto, u8 l4proto) rtnl_lock(); for_each_net(net) - nf_ct_iterate_cleanup(net, nf_nat_proto_remove, &clean, 0, 0); + nf_ct_iterate_cleanup_net(net, nf_nat_proto_remove, &clean, 0, 0); rtnl_unlock(); } @@ -600,7 +600,7 @@ static void nf_nat_l3proto_clean(u8 l3proto) rtnl_lock(); for_each_net(net) - nf_ct_iterate_cleanup(net, nf_nat_proto_remove, &clean, 0, 0); + nf_ct_iterate_cleanup_net(net, nf_nat_proto_remove, &clean, 0, 0); rtnl_unlock(); } @@ -826,7 +826,7 @@ static void __net_exit nf_nat_net_exit(struct net *net) { struct nf_nat_proto_clean clean = {}; - nf_ct_iterate_cleanup(net, nf_nat_proto_clean, &clean, 0, 0); + nf_ct_iterate_cleanup_net(net, nf_nat_proto_clean, &clean, 0, 0); } static struct pernet_operations nf_nat_net_ops = { |