Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / net / netfilter / nf_conntrack_standalone.c

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index fedee394366187cf35bfa242c9cd1584f0eb0108..ebb67d33bd63adbee3cb0c0d889e81a932482a45 100644 (file)
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -545,16 +545,20 @@ out_init:
        return ret;
 }
 
-static void nf_conntrack_pernet_exit(struct net *net)
+static void nf_conntrack_pernet_exit(struct list_head *net_exit_list)
 {
-       nf_conntrack_standalone_fini_sysctl(net);
-       nf_conntrack_standalone_fini_proc(net);
-       nf_conntrack_cleanup_net(net);
+       struct net *net;
+
+       list_for_each_entry(net, net_exit_list, exit_list) {
+               nf_conntrack_standalone_fini_sysctl(net);
+               nf_conntrack_standalone_fini_proc(net);
+       }
+       nf_conntrack_cleanup_net_list(net_exit_list);
 }
 
 static struct pernet_operations nf_conntrack_net_ops = {
-       .init = nf_conntrack_pernet_init,
-       .exit = nf_conntrack_pernet_exit,
+       .init           = nf_conntrack_pernet_init,
+       .exit_batch     = nf_conntrack_pernet_exit,
 };
 
 static int __init nf_conntrack_standalone_init(void)