diff options
author | Pablo Neira <pablo@netfilter.org> | 2015-05-13 18:19:36 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-14 01:10:05 -0400 |
commit | b8d0aad0c77f488d1d51a02d871a5cbc2d8032b9 (patch) | |
tree | 54db3bd7672895e4f52c1ce694f696b46252326f /include | |
parent | f7191483461ce2ae579b6f7227fa7ce49e006656 (diff) | |
download | linux-stable-b8d0aad0c77f488d1d51a02d871a5cbc2d8032b9.tar.gz linux-stable-b8d0aad0c77f488d1d51a02d871a5cbc2d8032b9.tar.bz2 linux-stable-b8d0aad0c77f488d1d51a02d871a5cbc2d8032b9.zip |
netfilter: add nf_hook_list_active()
In preparation to have netfilter ingress per-device hook list.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netfilter.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 388ed1952242..49d00638d1fa 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -134,26 +134,33 @@ extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; #ifdef HAVE_JUMP_LABEL extern struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; -static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook) +static inline bool nf_hook_list_active(struct list_head *nf_hook_list, + u_int8_t pf, unsigned int hook) { if (__builtin_constant_p(pf) && __builtin_constant_p(hook)) return static_key_false(&nf_hooks_needed[pf][hook]); - return !list_empty(&nf_hooks[pf][hook]); + return !list_empty(nf_hook_list); } #else -static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook) +static inline bool nf_hook_list_active(struct list_head *nf_hook_list, + u_int8_t pf, unsigned int hook) { - return !list_empty(&nf_hooks[pf][hook]); + return !list_empty(nf_hook_list); } #endif +static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook) +{ + return nf_hook_list_active(&nf_hooks[pf][hook], pf, hook); +} + int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state); /** * nf_hook_thresh - call a netfilter hook - * + * * Returns 1 if the hook has allowed the packet to pass. The function * okfn must be invoked by the caller in this case. Any other return * value indicates the packet has been consumed by the hook. |