---

yaml --- r: 223638 b: refs/heads/master c: 1730210 h: refs/heads/master v: v3
git-mirror · Dec 20, 2010 · 191f1d8 · 191f1d8
1 parent 93c9b56
commit 191f1d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad0081e43af6de3fecf308b0d098f9611835766b
+refs/heads/master: 173021072e86a0a5b3d2271347493a3e0d5f68e8
diff --git a/trunk/include/net/sch_generic.h b/trunk/include/net/sch_generic.h
@@ -610,11 +610,7 @@ static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask,
 {
 	struct sk_buff *n;
 
-	if ((action == TC_ACT_STOLEN || action == TC_ACT_QUEUED) &&
-	    !skb_shared(skb))
-		n = skb_get(skb);
-	else
-		n = skb_clone(skb, gfp_mask);
+	n = skb_clone(skb, gfp_mask);
 
 	if (n) {
 		n->tc_verd = SET_TC_VERD(n->tc_verd, 0);