summaryrefslogtreecommitdiffstats
path: root/net/sched/sch_netem.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-11-30 02:36:20 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 06:31:43 +0100
commit5e50da01d0ce7ef0ba3ed6cfabd62f327da0aca6 (patch)
tree6f2205ceae40a7fd5b498e94c60b65140740a027 /net/sched/sch_netem.c
parent[NET_SCHED]: Fix endless loops caused by inaccurate qlen counters (part 1) (diff)
downloadlinux-5e50da01d0ce7ef0ba3ed6cfabd62f327da0aca6.tar.xz
linux-5e50da01d0ce7ef0ba3ed6cfabd62f327da0aca6.zip
[NET_SCHED]: Fix endless loops (part 2): "simple" qdiscs
Convert the "simple" qdiscs to use qdisc_tree_decrease_qlen() where necessary: - all graft operations - destruction of old child qdiscs in prio, red and tbf change operation - purging of queue in sfq change operation Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_netem.c')
-rw-r--r--net/sched/sch_netem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 90aeeb7b7167..672c35445793 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -662,8 +662,8 @@ static int netem_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
sch_tree_lock(sch);
*old = xchg(&q->qdisc, new);
+ qdisc_tree_decrease_qlen(*old, (*old)->q.qlen);
qdisc_reset(*old);
- sch->q.qlen = 0;
sch_tree_unlock(sch);
return 0;