netfilter: nf_queue: remove unused hook entries pointer

Its not used anywhere, so remove this.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
index 7239105d9d2e27bac3d0714710cee815d082d051..3cb6dcf53a4e2aa74e7257a241065abb789f9162 100644 (file)
--- a/include/net/netfilter/nf_queue.h
+++ b/include/net/netfilter/nf_queue.h
@@ -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 */

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 21b74e7a7b2f69427ecb2b217b9c1940b6918af6..512383d5e53f98d859d613f8da3fb3de8956bd13 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -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;

diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 817a9e5d16e47accb2074d63c3ad52b2f2436b41..5d5bdf4500916137406b96b874b529d2522774c5 100644 (file)
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -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;

diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index b5b2be55ca82e830b1c65daf09a57594fac205e1..c72a5bdd123fe0aa9d2dad5e62de06694e98baa8 100644 (file)
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -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 @@ err:
 
 /* 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 @@ next_hook:
                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;