[NETFILTER]: Replace sk_buff ** with sk_buff *

With all the users of the double pointers removed, this patch mops up by
finally replacing all occurances of sk_buff ** in the netfilter API by
sk_buff *.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 3 insertions, 8 deletions

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 6b407ece953c..fa006e06ce33 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -202,11 +202,7 @@ static int tcf_ipt(struct sk_buff *skb, struct tc_action *a,
         /* yes, we have to worry about both in and out dev
          worry later - danger - this API seems to have changed
          from earlier kernels */
-
-        /* iptables targets take a double skb pointer in case the skb
-         * needs to be replaced. We don't own the skb, so this must not
-         * happen. The pskb_expand_head above should make sure of this */
-        ret = ipt->tcfi_t->u.kernel.target->target(&skb, skb->dev, NULL,
+        ret = ipt->tcfi_t->u.kernel.target->target(skb, skb->dev, NULL,
                                                    ipt->tcfi_hook,
                                                    ipt->tcfi_t->u.kernel.target,
                                                    ipt->tcfi_t->data);
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 2d32fd27496e..3f8335e6ea2e 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -205,20 +205,19 @@ static unsigned int ingress_drop(struct Qdisc *sch)
 #ifndef CONFIG_NET_CLS_ACT
 #ifdef CONFIG_NETFILTER
 static unsigned int
-ing_hook(unsigned int hook, struct sk_buff **pskb,
+ing_hook(unsigned int hook, struct sk_buff *skb,
                              const struct net_device *indev,
                              const struct net_device *outdev,
                              int (*okfn)(struct sk_buff *))
 {
 
         struct Qdisc *q;
-        struct sk_buff *skb = *pskb;
         struct net_device *dev = skb->dev;
         int fwres=NF_ACCEPT;
 
         DPRINTK("ing_hook: skb %s dev=%s len=%u\n",
                 skb->sk ? "(owned)" : "(unowned)",
-                skb->dev ? (*pskb)->dev->name : "(no dev)",
+                skb->dev ? skb->dev->name : "(no dev)",
                 skb->len);
 
         if (dev->qdisc_ingress) {