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_conntrack_proto.c | |
| parent | netfilter: nft_rt: make local functions static (diff) | |
| download | linux-dev-9fd6452d67fb2acda12e5914e2ad371f067f3465.tar.xz linux-dev-9fd6452d67fb2acda12e5914e2ad371f067f3465.zip | |
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 '')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 2de6c1fe3261..b7d01f27d463 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -282,7 +282,7 @@ void nf_ct_l3proto_pernet_unregister(struct net *net, proto->net_ns_put(net); /* Remove all contrack entries for this protocol */ - nf_ct_iterate_cleanup(net, kill_l3proto, proto, 0, 0); + nf_ct_iterate_cleanup_net(net, kill_l3proto, proto, 0, 0); } EXPORT_SYMBOL_GPL(nf_ct_l3proto_pernet_unregister); @@ -450,7 +450,7 @@ void nf_ct_l4proto_pernet_unregister_one(struct net *net, nf_ct_l4proto_unregister_sysctl(net, pn, l4proto); /* Remove all contrack entries for this protocol */ - nf_ct_iterate_cleanup(net, kill_l4proto, l4proto, 0, 0); + nf_ct_iterate_cleanup_net(net, kill_l4proto, l4proto, 0, 0); } EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_unregister_one); |