You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 3d3cdc38e8c265a9f9d3825e823e772872bca1b8 Mon Sep 17 00:00:00 2001
|
|
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Sat, 9 Dec 2017 15:19:14 +0100
|
|
Subject: [PATCH 01/11] netfilter: core: add nf_remove_net_hook
|
|
|
|
Just a cleanup, __nf_unregister_net_hook() is used by a follow up patch
|
|
when handling NFPROTO_INET as a real family from the core.
|
|
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
net/netfilter/core.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/net/netfilter/core.c
|
|
+++ b/net/netfilter/core.c
|
|
@@ -356,7 +356,7 @@ int nf_register_net_hook(struct net *net
|
|
EXPORT_SYMBOL(nf_register_net_hook);
|
|
|
|
/*
|
|
- * __nf_unregister_net_hook - remove a hook from blob
|
|
+ * nf_remove_net_hook - remove a hook from blob
|
|
*
|
|
* @oldp: current address of hook blob
|
|
* @unreg: hook to unregister
|
|
@@ -364,8 +364,8 @@ EXPORT_SYMBOL(nf_register_net_hook);
|
|
* This cannot fail, hook unregistration must always succeed.
|
|
* Therefore replace the to-be-removed hook with a dummy hook.
|
|
*/
|
|
-static void __nf_unregister_net_hook(struct nf_hook_entries *old,
|
|
- const struct nf_hook_ops *unreg)
|
|
+static void nf_remove_net_hook(struct nf_hook_entries *old,
|
|
+ const struct nf_hook_ops *unreg)
|
|
{
|
|
struct nf_hook_ops **orig_ops;
|
|
bool found = false;
|
|
@@ -411,7 +411,7 @@ void nf_unregister_net_hook(struct net *
|
|
return;
|
|
}
|
|
|
|
- __nf_unregister_net_hook(p, reg);
|
|
+ nf_remove_net_hook(p, reg);
|
|
|
|
p = __nf_hook_entries_try_shrink(pp);
|
|
mutex_unlock(&nf_hook_mutex);
|