Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / netfilter / nf_queue.c

diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 2c440015ff0c20da42b8c72900bf0a214a4e315e..a2b58de8260074b86b6a4b51d0e76dc281ef3318 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;
@@ -229,12 +228,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))
@@ -340,7 +338,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;