Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/net/netfilter/xt_NOTRACK.c b/net/netfilter/xt_NOTRACK.c
index fec1aefb1c326b5bdf2fd2446a3b95931c0a4f65..4976ce186615e51c3159c74fbbec4c68807a3dd4 100644 (file)
--- a/net/netfilter/xt_NOTRACK.c
+++ b/net/netfilter/xt_NOTRACK.c
@@ -12,7 +12,7 @@ MODULE_ALIAS("ipt_NOTRACK");
 MODULE_ALIAS("ip6t_NOTRACK");
 
 static unsigned int
-target(struct sk_buff **pskb,
+target(struct sk_buff *skb,
        const struct net_device *in,
        const struct net_device *out,
        unsigned int hooknum,
@@ -20,16 +20,16 @@ target(struct sk_buff **pskb,
        const void *targinfo)
 {
        /* Previously seen (loopback)? Ignore. */
-       if ((*pskb)->nfct != NULL)
+       if (skb->nfct != NULL)
                return XT_CONTINUE;
 
        /* Attach fake conntrack entry.
           If there is a real ct entry correspondig to this packet,
           it'll hang aroun till timing out. We don't deal with it
           for performance reasons. JK */
-       (*pskb)->nfct = &nf_conntrack_untracked.ct_general;
-       (*pskb)->nfctinfo = IP_CT_NEW;
-       nf_conntrack_get((*pskb)->nfct);
+       skb->nfct = &nf_conntrack_untracked.ct_general;
+       skb->nfctinfo = IP_CT_NEW;
+       nf_conntrack_get(skb->nfct);
 
        return XT_CONTINUE;
 }