diff options
author | Patrick McHardy <kaber@trash.net> | 2006-11-29 20:36:20 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:31:43 -0500 |
commit | 5e50da01d0ce7ef0ba3ed6cfabd62f327da0aca6 (patch) | |
tree | 6f2205ceae40a7fd5b498e94c60b65140740a027 /net/sched/sch_netem.c | |
parent | 43effa1e57fc4635e0301b27d78f9d83afe78974 (diff) |
[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.c | 2 |
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, | |||
662 | 662 | ||
663 | sch_tree_lock(sch); | 663 | sch_tree_lock(sch); |
664 | *old = xchg(&q->qdisc, new); | 664 | *old = xchg(&q->qdisc, new); |
665 | qdisc_tree_decrease_qlen(*old, (*old)->q.qlen); | ||
665 | qdisc_reset(*old); | 666 | qdisc_reset(*old); |
666 | sch->q.qlen = 0; | ||
667 | sch_tree_unlock(sch); | 667 | sch_tree_unlock(sch); |
668 | 668 | ||
669 | return 0; | 669 | return 0; |