Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf

[sfrench/cifs-2.6.git] / net / netfilter / nf_tables_api.c

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 76bd4d03dbda4059f24fe305b5ee0999723e769a..e7152d599d73fa1fedbf93a6ab7d2ce9e957270a 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -10090,7 +10090,8 @@ static void __net_exit nf_tables_exit_net(struct net *net)
        struct nftables_pernet *nft_net = nft_pernet(net);
 
        mutex_lock(&nft_net->commit_mutex);
-       if (!list_empty(&nft_net->commit_list))
+       if (!list_empty(&nft_net->commit_list) ||
+           !list_empty(&nft_net->module_list))
                __nf_tables_abort(net, NFNL_ABORT_NONE);
        __nft_release_tables(net);
        mutex_unlock(&nft_net->commit_mutex);