summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-09-27 16:36:23 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 18:01:49 -0700
commit787e0617e5176176c494a787f1b0a5248a3db568 (patch)
tree1ea176bcc24937619d52759016ccf70b4927733d /net
parent321efff7c3b7a26fa0522cb12b2af2ac82c05f1e (diff)
downloadlinux-3.10-787e0617e5176176c494a787f1b0a5248a3db568.tar.gz
linux-3.10-787e0617e5176176c494a787f1b0a5248a3db568.tar.bz2
linux-3.10-787e0617e5176176c494a787f1b0a5248a3db568.zip
[NET_SCHED]: HTB: fix incorrect use of RB_EMPTY_NODE
Fix incorrect use of RB_EMPTY_NODE in htb_safe_rb_erase, which makes it skip nodes within the rbtree instead of nodes not in the tree, resulting in crashes later on. The root cause for this seems to be the very counter-intuitive behaviour of the RB_EMPTY_NODE macro, which returns _false_ when the node is empty. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_htb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index bb3ddd4784b..6c058e3660c 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -391,7 +391,7 @@ static inline void htb_add_class_to_row(struct htb_sched *q,
/* If this triggers, it is a bug in this code, but it need not be fatal */
static void htb_safe_rb_erase(struct rb_node *rb, struct rb_root *root)
{
- if (RB_EMPTY_NODE(rb)) {
+ if (!RB_EMPTY_NODE(rb)) {
WARN_ON(1);
} else {
rb_erase(rb, root);