From a4ad67741c9dc5fc67f4bfd9145b569158a122a5 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Tue, 9 Dec 2008 22:35:02 -0800 Subject: [PATCH] --- yaml --- r: 122565 b: refs/heads/master c: 512bb43eb5422ee69a1be05ea0d89dc074fac9a2 h: refs/heads/master i: 122563: 5213fef45a56356ad2a41bdc7effa022c4cba114 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_htb.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5c9c3e578fa0..ba6228b7f12c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b5c0077e1615bb16e777a10ec1fc1195ba059ac +refs/heads/master: 512bb43eb5422ee69a1be05ea0d89dc074fac9a2 diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c index b820a0ae7355..5070643ce534 100644 --- a/trunk/net/sched/sch_htb.c +++ b/trunk/net/sched/sch_htb.c @@ -726,7 +726,7 @@ static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio, u32 *pid; } stk[TC_HTB_MAXDEPTH], *sp = stk; - WARN_ON(!tree->rb_node); + BUG_ON(!tree->rb_node); sp->root = tree->rb_node; sp->pptr = pptr; sp->pid = pid; @@ -746,9 +746,10 @@ static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio, *sp->pptr = (*sp->pptr)->rb_left; if (sp > stk) { sp--; - WARN_ON(!*sp->pptr); - if (!*sp->pptr) + if (!*sp->pptr) { + WARN_ON(1); return NULL; + } htb_next_rb_node(sp->pptr); } } else { @@ -779,8 +780,7 @@ static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, int prio, do { next: - WARN_ON(!cl); - if (!cl) + if (unlikely(!cl)) return NULL; /* class can be empty - it is unlikely but can be true if leaf