Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index a481a349f7bf6b5e29d00e75343f5a5934b47f1a..0cef1433d660d2fbd5925f2197f296821fdbcae2 100644 (file)
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -256,14 +256,14 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info,
 
        if (verdict == NF_ACCEPT) {
                afinfo = nf_get_afinfo(info->pf);
-               if (!afinfo || afinfo->reroute(&skb, info) < 0)
+               if (!afinfo || afinfo->reroute(skb, info) < 0)
                        verdict = NF_DROP;
        }
 
        if (verdict == NF_ACCEPT) {
        next_hook:
                verdict = nf_iterate(&nf_hooks[info->pf][info->hook],
-                                    &skb, info->hook,
+                                    skb, info->hook,
                                     info->indev, info->outdev, &elem,
                                     info->okfn, INT_MIN);
        }