diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-11-03 10:56:35 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-11-03 11:52:58 +0100 |
commit | 01886bd91f1ba418ce669dfe97a06ca9504e482a (patch) | |
tree | 8ca4687177e9159d364790ce83c303360424dbd4 /include/linux/netfilter_ingress.h | |
parent | c63cbc4604199af6627633f2bb3847a8951f48e5 (diff) | |
download | op-kernel-dev-01886bd91f1ba418ce669dfe97a06ca9504e482a.zip op-kernel-dev-01886bd91f1ba418ce669dfe97a06ca9504e482a.tar.gz |
netfilter: remove hook_entries field from nf_hook_state
This field is only useful for nf_queue, so store it in the
nf_queue_entry structure instead, away from the core path. Pass
hook_head to nf_hook_slow().
Since we always have a valid entry on the first iteration in
nf_iterate(), we can use 'do { ... } while (entry)' loop instead.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/linux/netfilter_ingress.h')
-rw-r--r-- | include/linux/netfilter_ingress.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netfilter_ingress.h b/include/linux/netfilter_ingress.h index fd44e41..2dc3b49 100644 --- a/include/linux/netfilter_ingress.h +++ b/include/linux/netfilter_ingress.h @@ -26,10 +26,10 @@ static inline int nf_hook_ingress(struct sk_buff *skb) if (unlikely(!e)) return 0; - nf_hook_state_init(&state, e, NF_NETDEV_INGRESS, + nf_hook_state_init(&state, NF_NETDEV_INGRESS, NFPROTO_NETDEV, skb->dev, NULL, NULL, dev_net(skb->dev), NULL); - return nf_hook_slow(skb, &state); + return nf_hook_slow(skb, &state, e); } static inline void nf_hook_ingress_init(struct net_device *dev) |