]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
netfilter: kill NF_HOOK_THRESH() and state->tresh
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 3 Nov 2016 09:56:12 +0000 (10:56 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 3 Nov 2016 09:56:12 +0000 (10:56 +0100)
commit1610a73c4175e7d63985316b52ac932b65a4dc90
tree9c515077cdcf8abf44e327fccb549bb74e5b8b2a
parentd2be66f6858d6243395763cb643de55bad96d33d
netfilter: kill NF_HOOK_THRESH() and state->tresh

Patch c5136b15ea36 ("netfilter: bridge: add and use br_nf_hook_thresh")
introduced br_nf_hook_thresh().

Replace NF_HOOK_THRESH() by br_nf_hook_thresh from
br_nf_forward_finish(), so we have no more callers for this macro.

As a result, state->thresh and explicit thresh parameter in the hook
state structure is not required anymore. And we can get rid of
skip-hook-under-thresh loop in nf_iterate() in the core path that is
only used by br_netfilter to search for the filter hook.

Suggested-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/linux/netfilter.h
include/linux/netfilter_ingress.h
net/bridge/br_netfilter_hooks.c
net/bridge/netfilter/ebtable_broute.c
net/netfilter/core.c
net/netfilter/nf_queue.c