diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2010-12-20 04:35:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-20 10:27:19 -0800 |
| commit | 173021072e86a0a5b3d2271347493a3e0d5f68e8 (patch) | |
| tree | 36b0fbef794fd5ea4d72b6c59aec4779236b5374 /include | |
| parent | ad0081e43af6de3fecf308b0d098f9611835766b (diff) | |
| download | linux-173021072e86a0a5b3d2271347493a3e0d5f68e8.tar.gz linux-173021072e86a0a5b3d2271347493a3e0d5f68e8.tar.bz2 linux-173021072e86a0a5b3d2271347493a3e0d5f68e8.zip | |
net_sched: always clone skbs
Pawel reported a panic related to handling shared skbs in ixgbe
incorrectly. So we need to revert my previous patch to work around
this bug. Instead of reverting the patch completely, I just revert
the essential lines, so we can add the previous optimization
back more easily in future.
commit 3511c9132f8b1e1b5634e41a3331c44b0c13be70
Author: Changli Gao <xiaosuo@gmail.com>
Date: Sat Oct 16 13:04:08 2010 +0000
net_sched: remove the unused parameter of qdisc_create_dflt()
Reported-by: Pawel Staszewski <pstaszewski@itcare.pl>
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -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 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); |