diff options
author | Tony Lindgren <tony@atomide.com> | 2012-05-10 01:32:44 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-10 01:32:44 +0400 |
commit | 65c98038394e65228490ef44353f5d4665690f55 (patch) | |
tree | c7bd5afb40d455d995ec65bd9a6fb5d456e0bd45 /net/sched/sch_netem.c | |
parent | bfd17879866b36e95c58721da070d9f2ac7f8901 (diff) | |
parent | b2f44dc29bfab77b10f3a709f14677f51ce3a4cd (diff) | |
download | linux-65c98038394e65228490ef44353f5d4665690f55.tar.xz |
Merge branch 'fixes-non-critical' into cleanup-devices
Diffstat (limited to 'net/sched/sch_netem.c')
-rw-r--r-- | net/sched/sch_netem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 5da548fa7ae9..ebd22966f748 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -408,10 +408,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) { if (!(skb = skb_unshare(skb, GFP_ATOMIC)) || (skb->ip_summed == CHECKSUM_PARTIAL && - skb_checksum_help(skb))) { - sch->qstats.drops++; - return NET_XMIT_DROP; - } + skb_checksum_help(skb))) + return qdisc_drop(skb, sch); skb->data[net_random() % skb_headlen(skb)] ^= 1<<(net_random() % 8); } |