[NET_CLS_ACT]: Use skb_act_clone

clean skb_clone of any signs of CONFIG_NET_CLS_ACT and
have mirred us skb_act_clone()

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 7b7c6c44c2da28b5fe2e22ababff4dcd61e6e72e..573e1724019716767a8d8872d5c290c4337e6999 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -415,13 +415,6 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb)
        n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len;
        n->nohdr = 0;
        n->destructor = NULL;
-#ifdef CONFIG_NET_CLS_ACT
-       /* FIXME What is this and why don't we do it in copy_skb_header? */
-       n->tc_verd = SET_TC_VERD(n->tc_verd,0);
-       n->tc_verd = CLR_TC_OK2MUNGE(n->tc_verd);
-       n->tc_verd = CLR_TC_MUNGED(n->tc_verd);
-       C(iif);
-#endif
        C(truesize);
        atomic_set(&n->users, 1);
        C(head);

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index fd7bca4d5c208f173cc673b8753ff2dac4e14c51..c3fde9180f9d713ac6f358628b1e7737a2cc08c9 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -166,7 +166,7 @@ bad_mirred:
                return TC_ACT_SHOT;
        }
 
-       skb2 = skb_clone(skb, GFP_ATOMIC);
+       skb2 = skb_act_clone(skb, GFP_ATOMIC);
        if (skb2 == NULL)
                goto bad_mirred;
        if (m->tcfm_eaction != TCA_EGRESS_MIRROR &&