diff options
| author | Florian Westphal | 2017-05-21 12:52:55 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2017-05-29 12:46:08 +0200 |
| commit | 9fd6452d67fb2acda12e5914e2ad371f067f3465 (patch) | |
| tree | 10a6c1890a67707717e8e577e8d95fc0b522aa6f /net/netfilter/nf_conntrack_core.c | |
| parent | netfilter: nft_rt: make local functions static (diff) | |
| download | kernel-qcow2-linux-9fd6452d67fb2acda12e5914e2ad371f067f3465.tar.gz kernel-qcow2-linux-9fd6452d67fb2acda12e5914e2ad371f067f3465.tar.xz kernel-qcow2-linux-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 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index e847dbaa0c6b..2730f9df33b7 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1634,9 +1634,9 @@ found: return ct; } -void nf_ct_iterate_cleanup(struct net *net, - int (*iter)(struct nf_conn *i, void *data), - void *data, u32 portid, int report) +void nf_ct_iterate_cleanup_net(struct net *net, + int (*iter)(struct nf_conn *i, void *data), + void *data, u32 portid, int report) { struct nf_conn *ct; unsigned int bucket = 0; @@ -1654,7 +1654,7 @@ void nf_ct_iterate_cleanup(struct net *net, cond_resched(); } } -EXPORT_SYMBOL_GPL(nf_ct_iterate_cleanup); +EXPORT_SYMBOL_GPL(nf_ct_iterate_cleanup_net); static int kill_all(struct nf_conn *i, void *data) { @@ -1723,7 +1723,7 @@ void nf_conntrack_cleanup_net_list(struct list_head *net_exit_list) i_see_dead_people: busy = 0; list_for_each_entry(net, net_exit_list, exit_list) { - nf_ct_iterate_cleanup(net, kill_all, NULL, 0, 0); + nf_ct_iterate_cleanup_net(net, kill_all, NULL, 0, 0); if (atomic_read(&net->ct.count) != 0) busy = 1; } |