---

yaml
---
r: 72607
b: refs/heads/master
c: a057ae3
h: refs/heads/master
i:
  72605: 0283d8b
  72603: e0f1a4e
  72599: 5027b59
  72591: 3326aec
  72575: 2fc1927
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12da81d11a34d3bdef52d731cc75f7ec72d0e815
+refs/heads/master: a057ae3c104dd2c661e55d2af37e70d168c65e00

trunk/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);

trunk/net/sched/act_mirred.c

@@ -166,7 +166,7 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
 		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 &&