From 191f1d89acfe4417d8181d2bd1489c8ada2ea413 Mon Sep 17 00:00:00 2001 From: Changli Gao Date: Mon, 20 Dec 2010 04:35:30 +0000 Subject: [PATCH] --- yaml --- r: 223638 b: refs/heads/master c: 173021072e86a0a5b3d2271347493a3e0d5f68e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/sch_generic.h | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 05e03e716da8..4f11a79e9380 100644 --- 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 index ea1f8a83160d..79f34e2b752f 100644 --- 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);