1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/generic/backport-4.19/298-v4.16-netfilter-core-pass-family-as-parameter-to-nf_remove.patch b/target/linux/generic/backport-4.19/298-v4.16-netfilter-core-pass-family-as-parameter-to-nf_remove.patch
deleted file mode 100644
index 4c52635c13..0000000000
--- a/target/linux/generic/backport-4.19/298-v4.16-netfilter-core-pass-family-as-parameter-to-nf_remove.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 30259408118f550f5969fda19c0d67020d21eda8 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 9 Dec 2017 15:26:37 +0100
-Subject: [PATCH 10/11] netfilter: core: pass family as parameter to
- nf_remove_net_hook()
-
-So static_key_slow_dec applies to the family behind NFPROTO_INET.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/core.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -365,7 +365,7 @@ EXPORT_SYMBOL(nf_register_net_hook);
-  * Therefore replace the to-be-removed hook with a dummy hook.
-  */
- static void nf_remove_net_hook(struct nf_hook_entries *old,
--			       const struct nf_hook_ops *unreg)
-+			       const struct nf_hook_ops *unreg, int pf)
- {
- 	struct nf_hook_ops **orig_ops;
- 	bool found = false;
-@@ -383,14 +383,14 @@ static void nf_remove_net_hook(struct nf
- 
- 	if (found) {
- #ifdef CONFIG_NETFILTER_INGRESS
--		if (unreg->pf == NFPROTO_NETDEV && unreg->hooknum == NF_NETDEV_INGRESS)
-+		if (pf == NFPROTO_NETDEV && unreg->hooknum == NF_NETDEV_INGRESS)
- 			net_dec_ingress_queue();
- #endif
- #ifdef HAVE_JUMP_LABEL
--		static_key_slow_dec(&nf_hooks_needed[unreg->pf][unreg->hooknum]);
-+		static_key_slow_dec(&nf_hooks_needed[pf][unreg->hooknum]);
- #endif
- 	} else {
--		WARN_ONCE(1, "hook not found, pf %d num %d", unreg->pf, unreg->hooknum);
-+		WARN_ONCE(1, "hook not found, pf %d num %d", pf, unreg->hooknum);
- 	}
- }
- 
-@@ -411,7 +411,7 @@ void nf_unregister_net_hook(struct net *
- 		return;
- 	}
- 
--	nf_remove_net_hook(p, reg);
-+	nf_remove_net_hook(p, reg, reg->pf);
- 
- 	p = __nf_hook_entries_try_shrink(pp);
- 	mutex_unlock(&nf_hook_mutex);