diff options
Diffstat (limited to 'net')
-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 e83d61ca78ca..5da548fa7ae9 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
@@ -501,9 +501,8 @@ tfifo_dequeue: | |||
501 | 501 | ||
502 | /* if more time remaining? */ | 502 | /* if more time remaining? */ |
503 | if (cb->time_to_send <= psched_get_time()) { | 503 | if (cb->time_to_send <= psched_get_time()) { |
504 | skb = qdisc_dequeue_tail(sch); | 504 | __skb_unlink(skb, &sch->q); |
505 | if (unlikely(!skb)) | 505 | sch->qstats.backlog -= qdisc_pkt_len(skb); |
506 | goto qdisc_dequeue; | ||
507 | 506 | ||
508 | #ifdef CONFIG_NET_CLS_ACT | 507 | #ifdef CONFIG_NET_CLS_ACT |
509 | /* | 508 | /* |
@@ -539,7 +538,6 @@ deliver: | |||
539 | qdisc_watchdog_schedule(&q->watchdog, cb->time_to_send); | 538 | qdisc_watchdog_schedule(&q->watchdog, cb->time_to_send); |
540 | } | 539 | } |
541 | 540 | ||
542 | qdisc_dequeue: | ||
543 | if (q->qdisc) { | 541 | if (q->qdisc) { |
544 | skb = q->qdisc->ops->dequeue(q->qdisc); | 542 | skb = q->qdisc->ops->dequeue(q->qdisc); |
545 | if (skb) | 543 | if (skb) |