projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tegra-for-4.5-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...
[cascardo/linux.git]
/
include
/
linux
/
netfilter_ingress.h
diff --git
a/include/linux/netfilter_ingress.h
b/include/linux/netfilter_ingress.h
index
187feab
..
5fcd375
100644
(file)
--- a/
include/linux/netfilter_ingress.h
+++ b/
include/linux/netfilter_ingress.h
@@
-5,10
+5,13
@@
#include <linux/netdevice.h>
#ifdef CONFIG_NETFILTER_INGRESS
#include <linux/netdevice.h>
#ifdef CONFIG_NETFILTER_INGRESS
-static inline
int nf_hook_ingress_active(
struct sk_buff *skb)
+static inline
bool nf_hook_ingress_active(const
struct sk_buff *skb)
{
{
- return nf_hook_list_active(&skb->dev->nf_hooks_ingress,
- NFPROTO_NETDEV, NF_NETDEV_INGRESS);
+#ifdef HAVE_JUMP_LABEL
+ if (!static_key_false(&nf_hooks_needed[NFPROTO_NETDEV][NF_NETDEV_INGRESS]))
+ return false;
+#endif
+ return !list_empty(&skb->dev->nf_hooks_ingress);
}
static inline int nf_hook_ingress(struct sk_buff *skb)
}
static inline int nf_hook_ingress(struct sk_buff *skb)
@@
-16,8
+19,8
@@
static inline int nf_hook_ingress(struct sk_buff *skb)
struct nf_hook_state state;
nf_hook_state_init(&state, &skb->dev->nf_hooks_ingress,
struct nf_hook_state state;
nf_hook_state_init(&state, &skb->dev->nf_hooks_ingress,
- NF_NETDEV_INGRESS, INT_MIN, NFPROTO_NETDEV,
NULL,
- skb->dev, NULL, dev_net(skb->dev), NULL);
+ NF_NETDEV_INGRESS, INT_MIN, NFPROTO_NETDEV,
+ skb->dev, NULL,
NULL,
dev_net(skb->dev), NULL);
return nf_hook_slow(skb, &state);
}
return nf_hook_slow(skb, &state);
}