Merge commit 'v2.6.37' into sched/core

Merge reason: Merge the final .37 tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 5 deletions

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index ea1f8a83160d..79f34e2b752f 100644
--- a/include/net/sch_generic.h
+++ b/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);