]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
netfilter: nf_queue: only call synchronize_net twice if nf_queue is active
authorFlorian Westphal <fw@strlen.de>
Mon, 24 Apr 2017 13:37:41 +0000 (15:37 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 1 May 2017 09:19:12 +0000 (11:19 +0200)
commit039b40ee5854dc733cf786fee4a88e240a012115
tree49070019cfbd9dd9a86e32e50be465ca3346afcc
parentc83fa19603bdaeef17b815713dbbe3230c8a34ee
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>
include/net/netfilter/nf_queue.h
net/netfilter/core.c
net/netfilter/nf_internals.h
net/netfilter/nf_queue.c
net/netfilter/nfnetlink_queue.c