diff options
| author |   Florian Westphal <fw@strlen.de> | 2017-04-24 15:37:41 +0200 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2017-05-01 11:19:12 +0200 |
| commit | 039b40ee5854dc733cf786fee4a88e240a012115 (patch) | |
| tree | 49070019cfbd9dd9a86e32e50be465ca3346afcc /net/netfilter/nf_internals.h | |
| parent | netfilter: nf_log: don't call synchronize_rcu in nf_log_unset (diff) | |
| download | linux-dev-039b40ee5854dc733cf786fee4a88e240a012115.tar.xz linux-dev-039b40ee5854dc733cf786fee4a88e240a012115.zip | |
netfilter: nf_queue: only call synchronize_net twice if nf_queue is active
nf_unregister_net_hook(s) can avoid a second call to synchronize_net,
provided there is no nfqueue active in that net namespace (which is
the common case).
This also gets rid of the extra arg to nf_queue_nf_hook_drop(), normally
this gets called during netns cleanup so no packets should be queued.
For the rare case of base chain being unregistered or module removal
while nfqueue is in use the extra hiccup due to the packet drops isn't
a big deal.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_internals.h')
| -rw-r--r-- | net/netfilter/nf_internals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h index c46d214d5323..bfa742da83af 100644 --- a/net/netfilter/nf_internals.h +++ b/net/netfilter/nf_internals.h @@ -14,7 +14,7 @@ /* nf_queue.c */ int nf_queue(struct sk_buff *skb, struct nf_hook_state *state, struct nf_hook_entry **entryp, unsigned int verdict); -void nf_queue_nf_hook_drop(struct net *net, const struct nf_hook_entry *entry); +unsigned int nf_queue_nf_hook_drop(struct net *net); int __init netfilter_queue_init(void); /* nf_log.c */ |