netfilter: nf_queue: remove unused hook entries pointer
Subsystems (3)
Florian Westphal
maintainerPATCH 1/1 netfilter: nf_queue: remove unused hook entries pointer
Its not used anywhere, so remove this.
Signed-off-by Florian Westphal <[email protected]>
--- include/net/netfilter/nf_queue.h | 3 +-- net/bridge/br_input.c | 2 +- net/netfilter/core.c | 2 +- net/netfilter/nf_queue.c | 8 +++----- 4 files changed, 6 insertions(+), 9 deletions(-)
include/net/netfilter/nf_queue.h +1 -2
@@ -120,6 +120,5 @@ nfqueue_hash(const struct sk_buff *skb, u16 queue, u16 queues_total, u8 family, }int nf_queue (struct sk_buff *skb,struct nf_hook_state *state, -const struct nf_hook_entries *entries,unsigned int index, -unsigned int verdict); +unsigned int index,unsigned int verdict);#endif /* _NF_QUEUE_H */
net/bridge/br_input.c +1 -1
@@ -234,7 +234,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb)kfree_skb (skb);return RX_HANDLER_CONSUMED ;case NF_QUEUE : - ret =nf_queue (skb, &state, e, i, verdict); + ret =nf_queue (skb, &state, i, verdict);if (ret ==1 )continue ;return RX_HANDLER_CONSUMED ;
net/netfilter/core.c +1 -1
@@ -520,7 +520,7 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, ret = -EPERM ;return ret;case NF_QUEUE : - ret =nf_queue (skb, state, e, s, verdict); + ret =nf_queue (skb, state, s, verdict);if (ret ==1 )continue ;return ret;
net/netfilter/nf_queue.c +3 -5
@@ -156,7 +156,6 @@ static void nf_ip6_saveroute(const struct sk_buff *skb, }static int __nf_queue (struct sk_buff *skb,const struct nf_hook_state *state, -const struct nf_hook_entries *entries,unsigned int index,unsigned int queuenum) {int status = -ENOENT ;
@@ -225,12 +224,11 @@ static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state,/* Packets leaving via this function must come back through nf_reinject(). */ int nf_queue (struct sk_buff *skb,struct nf_hook_state *state, -const struct nf_hook_entries *entries,unsigned int index, -unsigned int verdict) +unsigned int index,unsigned int verdict) {int ret; - ret =__nf_queue (skb, state, entries, index, verdict >>NF_VERDICT_QBITS ); + ret =__nf_queue (skb, state, index, verdict >>NF_VERDICT_QBITS );if (ret <0 ) {if (ret == -ESRCH && (verdict &NF_VERDICT_FLAG_QUEUE_BYPASS ))
@@ -336,7 +334,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)local_bh_enable ();break ;case NF_QUEUE : - err =nf_queue (skb, &entry->state, hooks, i, verdict); + err =nf_queue (skb, &entry->state, i, verdict);if (err ==1 ) goto next_hook;break ;
Signature · 1 line
2.21.0
Quoted 1 line · Florian Westphal
Its not used anywhere, so remove this.
Applied, thanks.