* [NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels()
@ 2006-05-11 14:56 Patrick McHardy
2006-05-11 19:22 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Patrick McHardy @ 2006-05-11 14:56 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Netdev List
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1098 bytes --]
[NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels()
When deleting the last child the level of a class should drop to zero.
Noticed by Andreas Mueller <andreas@stapelspeicher.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit c75053e281212b5ed3990a0aaced865db7e456d2
tree be2c674d4545ea41200fc5c57d53a03cb0672a93
parent 0e44dc383787b472a7f13564c6bd8a44cc07d408
author Patrick McHardy <kaber@trash.net> Thu, 11 May 2006 10:29:30 +0200
committer Patrick McHardy <kaber@trash.net> Thu, 11 May 2006 10:29:30 +0200
net/sched/sch_hfsc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 91132f6..f1c7bd2 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -974,10 +974,10 @@ hfsc_adjust_levels(struct hfsc_class *cl
do {
level = 0;
list_for_each_entry(p, &cl->children, siblings) {
- if (p->level > level)
- level = p->level;
+ if (p->level >= level)
+ level = p->level + 1;
}
- cl->level = level + 1;
+ cl->level = level;
} while ((cl = cl->cl_parent) != NULL);
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels()
2006-05-11 14:56 [NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels() Patrick McHardy
@ 2006-05-11 19:22 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2006-05-11 19:22 UTC (permalink / raw)
To: kaber; +Cc: netdev
This patch looks fine, applied.
Thanks a lot Patrick.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-05-11 19:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-11 14:56 [NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels() Patrick McHardy
2006-05-11 19:22 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).