Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / net / netfilter / nf_tables_api.c

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index cfe636808541a07f2c4b69c29737d88a167efe2f..4a41eb92bcc0ab934f12305ad64a18c8804a52b2 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -130,20 +130,24 @@ static void nft_trans_destroy(struct nft_trans *trans)
 int nft_register_basechain(struct nft_base_chain *basechain,
                           unsigned int hook_nops)
 {
+       struct net *net = read_pnet(&basechain->pnet);
+
        if (basechain->flags & NFT_BASECHAIN_DISABLED)
                return 0;
 
-       return nf_register_hooks(basechain->ops, hook_nops);
+       return nf_register_net_hooks(net, basechain->ops, hook_nops);
 }
 EXPORT_SYMBOL_GPL(nft_register_basechain);
 
 void nft_unregister_basechain(struct nft_base_chain *basechain,
                              unsigned int hook_nops)
 {
+       struct net *net = read_pnet(&basechain->pnet);
+
        if (basechain->flags & NFT_BASECHAIN_DISABLED)
                return;
 
-       nf_unregister_hooks(basechain->ops, hook_nops);
+       nf_unregister_net_hooks(net, basechain->ops, hook_nops);
 }
 EXPORT_SYMBOL_GPL(nft_unregister_basechain);