3 files changed, 24 insertions, 9 deletions

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 552bfbef1bf1..0f39ac487012 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -1374,6 +1374,6 @@ struct nft_trans_flowtable {
         (((struct nft_trans_flowtable *)trans->data)->flowtable)
 
 int __init nft_chain_filter_init(void);
-void __exit nft_chain_filter_fini(void);
+void nft_chain_filter_fini(void);
 
 #endif /* _NET_NF_TABLES_H */
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 3008f93469c4..80636cc59686 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -7273,21 +7273,36 @@ static int __init nf_tables_module_init(void)
 {
         int err;
 
-        nft_chain_filter_init();
+        err = register_pernet_subsys(&nf_tables_net_ops);
+        if (err < 0)
+                return err;
+
+        err = nft_chain_filter_init();
+        if (err < 0)
+                goto err1;
 
         err = nf_tables_core_module_init();
         if (err < 0)
-                return err;
+                goto err2;
 
-        err = nfnetlink_subsys_register(&nf_tables_subsys);
+        err = register_netdevice_notifier(&nf_tables_flowtable_notifier);
         if (err < 0)
-                goto err;
+                goto err3;
 
-        register_netdevice_notifier(&nf_tables_flowtable_notifier);
+        /* must be last */
+        err = nfnetlink_subsys_register(&nf_tables_subsys);
+        if (err < 0)
+                goto err4;
 
-        return register_pernet_subsys(&nf_tables_net_ops);
-err:
+        return err;
+err4:
+        unregister_netdevice_notifier(&nf_tables_flowtable_notifier);
+err3:
         nf_tables_core_module_exit();
+err2:
+        nft_chain_filter_fini();
+err1:
+        unregister_pernet_subsys(&nf_tables_net_ops);
         return err;
 }
 
diff --git a/net/netfilter/nft_chain_filter.c b/net/netfilter/nft_chain_filter.c
index ea5b7c4944f6..9d07b277b9ee 100644
--- a/net/netfilter/nft_chain_filter.c
+++ b/net/netfilter/nft_chain_filter.c
@@ -392,7 +392,7 @@ int __init nft_chain_filter_init(void)
         return 0;
 }
 
-void __exit nft_chain_filter_fini(void)
+void nft_chain_filter_fini(void)
 {
         nft_chain_filter_bridge_fini();
         nft_chain_filter_inet_fini();