diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-20 16:24:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-20 16:24:14 -0500 |
| commit | d9993be65a77f500ae926176baa264816bfe3816 (patch) | |
| tree | bbb8c86114bf86e5ca3d1fbf89de3d98be5519ba /include/net/sch_generic.h | |
| parent | c4266263249f22479eb1abb1a1709c38240b1597 (diff) | |
| parent | aa3e219997e4b949be4199660936099ded0b401f (diff) | |
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.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 786cc396cb4a..0af57ebae762 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, | |||
| 611 | { | 611 | { |
| 612 | struct sk_buff *n; | 612 | struct sk_buff *n; |
| 613 | 613 | ||
| 614 | if ((action == TC_ACT_STOLEN || action == TC_ACT_QUEUED) && | 614 | n = skb_clone(skb, gfp_mask); |
| 615 | !skb_shared(skb)) | ||
| 616 | n = skb_get(skb); | ||
| 617 | else | ||
| 618 | n = skb_clone(skb, gfp_mask); | ||
| 619 | 615 | ||
| 620 | if (n) { | 616 | if (n) { |
| 621 | n->tc_verd = SET_TC_VERD(n->tc_verd, 0); | 617 | n->tc_verd = SET_TC_VERD(n->tc_verd, 0); |