Browse Source

[PKT_SCHED] sch_htb: use rb_first() cleanup

Use rb_first() to get first entry in rb tree.

Signed-off-by: Akinbou Mita <akinobu.mita@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Akinbou Mita 18 years ago
parent
commit
30bdbe397b
1 changed files with 2 additions and 3 deletions
  1. 2 3
      net/sched/sch_htb.c

+ 2 - 3
net/sched/sch_htb.c

@@ -786,11 +786,10 @@ static long htb_do_events(struct htb_sched *q, int level)
 	for (i = 0; i < 500; i++) {
 	for (i = 0; i < 500; i++) {
 		struct htb_class *cl;
 		struct htb_class *cl;
 		long diff;
 		long diff;
-		struct rb_node *p = q->wait_pq[level].rb_node;
+		struct rb_node *p = rb_first(&q->wait_pq[level]);
+
 		if (!p)
 		if (!p)
 			return 0;
 			return 0;
-		while (p->rb_left)
-			p = p->rb_left;
 
 
 		cl = rb_entry(p, struct htb_class, pq_node);
 		cl = rb_entry(p, struct htb_class, pq_node);
 		if (time_after(cl->pq_key, q->jiffies)) {
 		if (time_after(cl->pq_key, q->jiffies)) {