diff --git a/[refs] b/[refs] index 857a9c125af9..bc2b1593049c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e072b3fad5f3915102c94628b4971f52ff99dd05 +refs/heads/master: 116a0fc31c6c9b8fc821be5a96e5bf0b43260131 diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c index 5da548fa7ae9..ebd22966f748 100644 --- a/trunk/net/sched/sch_netem.c +++ b/trunk/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); }