summaryrefslogtreecommitdiffstats
path: root/include/net/sch_generic.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-12-20 13:24:14 -0800
committerDavid S. Miller <davem@davemloft.net>2010-12-20 13:24:14 -0800
commitd9993be65a77f500ae926176baa264816bfe3816 (patch)
treebbb8c86114bf86e5ca3d1fbf89de3d98be5519ba /include/net/sch_generic.h
parentc4266263249f22479eb1abb1a1709c38240b1597 (diff)
parentaa3e219997e4b949be4199660936099ded0b401f (diff)
downloadop-kernel-dev-d9993be65a77f500ae926176baa264816bfe3816.zip
op-kernel-dev-d9993be65a77f500ae926176baa264816bfe3816.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/sch_generic.h')
-rw-r--r--include/net/sch_generic.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 786cc39..0af57eb 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -611,11 +611,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);
OpenPOWER on IntegriCloud