Commit 0d9cb300 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: nf_queue: remove unused hook entries pointer

Its not used anywhere, so remove this.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent eca27f14
...@@ -120,6 +120,5 @@ nfqueue_hash(const struct sk_buff *skb, u16 queue, u16 queues_total, u8 family, ...@@ -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, int nf_queue(struct sk_buff *skb, struct nf_hook_state *state,
const struct nf_hook_entries *entries, unsigned int index, unsigned int index, unsigned int verdict);
unsigned int verdict);
#endif /* _NF_QUEUE_H */ #endif /* _NF_QUEUE_H */
...@@ -234,7 +234,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb) ...@@ -234,7 +234,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb)
kfree_skb(skb); kfree_skb(skb);
return RX_HANDLER_CONSUMED; return RX_HANDLER_CONSUMED;
case NF_QUEUE: case NF_QUEUE:
ret = nf_queue(skb, &state, e, i, verdict); ret = nf_queue(skb, &state, i, verdict);
if (ret == 1) if (ret == 1)
continue; continue;
return RX_HANDLER_CONSUMED; return RX_HANDLER_CONSUMED;
......
...@@ -520,7 +520,7 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, ...@@ -520,7 +520,7 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state,
ret = -EPERM; ret = -EPERM;
return ret; return ret;
case NF_QUEUE: case NF_QUEUE:
ret = nf_queue(skb, state, e, s, verdict); ret = nf_queue(skb, state, s, verdict);
if (ret == 1) if (ret == 1)
continue; continue;
return ret; return ret;
......
...@@ -156,7 +156,6 @@ static void nf_ip6_saveroute(const struct sk_buff *skb, ...@@ -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, 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) unsigned int index, unsigned int queuenum)
{ {
int status = -ENOENT; int status = -ENOENT;
...@@ -225,12 +224,11 @@ static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state, ...@@ -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(). */ /* Packets leaving via this function must come back through nf_reinject(). */
int nf_queue(struct sk_buff *skb, struct nf_hook_state *state, int nf_queue(struct sk_buff *skb, struct nf_hook_state *state,
const struct nf_hook_entries *entries, unsigned int index, unsigned int index, unsigned int verdict)
unsigned int verdict)
{ {
int ret; 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 < 0) {
if (ret == -ESRCH && if (ret == -ESRCH &&
(verdict & NF_VERDICT_FLAG_QUEUE_BYPASS)) (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS))
...@@ -336,7 +334,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) ...@@ -336,7 +334,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
local_bh_enable(); local_bh_enable();
break; break;
case NF_QUEUE: case NF_QUEUE:
err = nf_queue(skb, &entry->state, hooks, i, verdict); err = nf_queue(skb, &entry->state, i, verdict);
if (err == 1) if (err == 1)
goto next_hook; goto next_hook;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment