From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nf-next,v2 1/7] netfilter: core: add nf_remove_net_hook
Date: Sun, 10 Dec 2017 21:34:49 +0100 [thread overview]
Message-ID: <20171210203455.11651-2-pablo@netfilter.org> (raw)
In-Reply-To: <20171210203455.11651-1-pablo@netfilter.org>
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(-)
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 3508a5c8edbb..9153b6e03f6b 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -360,7 +360,7 @@ int nf_register_net_hook(struct net *net, const struct nf_hook_ops *reg)
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
@@ -368,8 +368,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;
@@ -415,7 +415,7 @@ void nf_unregister_net_hook(struct net *net, const struct nf_hook_ops *reg)
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);
--
2.11.0
next prev parent reply other threads:[~2017-12-10 20:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-10 20:34 [PATCH nf-next,v2 0/7] handle NFPROTO_INET from core Pablo Neira Ayuso
2017-12-10 20:34 ` Pablo Neira Ayuso [this message]
2017-12-10 20:34 ` [PATCH nf-next,v2 2/7] netfilter: core: pass hook number, family and device to nf_find_hook_list() Pablo Neira Ayuso
2017-12-10 20:34 ` [PATCH nf-next,v2 3/7] netfilter: core: pass family as parameter to nf_remove_net_hook() Pablo Neira Ayuso
2017-12-10 20:34 ` [PATCH nf-next,v2 4/7] netfilter: core: support for NFPROTO_INET hook registration Pablo Neira Ayuso
2017-12-10 20:34 ` [PATCH nf-next,v2 5/7] netfilter: nf_tables_inet: don't use multihook infrastructure anymore Pablo Neira Ayuso
2017-12-10 20:34 ` [PATCH nf-next,v2 6/7] netfilter: nf_tables: remove multihook chains and families Pablo Neira Ayuso
2017-12-10 20:34 ` [PATCH nf-next,v2 7/7] netfilter: nf_tables: remove hooks from family definition Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171210203455.11651-2-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).