From e051890b50d0951b4adc6961c389043c2778b549 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Sun, 2 Nov 2008 00:36:03 -0700 Subject: [PATCH] --- yaml --- r: 121669 b: refs/heads/master c: 8ba25dad0ac78850cd46d91186a27d60f7314752 h: refs/heads/master i: 121667: 89aed5c4dfc7d65a7ce563941648752c26684571 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_netem.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 682faf08b40d..5f92164af9a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02201464119334690fe209849843881b8e9cfa9f +refs/heads/master: 8ba25dad0ac78850cd46d91186a27d60f7314752 diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c index 2ad09594c8bc..1aa43453705c 100644 --- a/trunk/net/sched/sch_netem.c +++ b/trunk/net/sched/sch_netem.c @@ -233,7 +233,11 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) */ cb->time_to_send = psched_get_time(); q->counter = 0; - ret = q->qdisc->ops->requeue(skb, q->qdisc); + + __skb_queue_head(&q->qdisc->q, skb); + q->qdisc->qstats.backlog += qdisc_pkt_len(skb); + q->qdisc->qstats.requeues++; + ret = NET_XMIT_SUCCESS; } if (likely(ret == NET_XMIT_SUCCESS)) {