From: Ismail Donmez <ismail@pardus.org.tr>
Date: Tue, 3 Oct 2006 20:49:10 +0000 (-0700)
Subject: [NET_SCHED]: Revert "HTB: fix incorrect use of RB_EMPTY_NODE"
X-Git-Tag: v2.6.19-rc1~33^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81771b3b20fb4e98c6f2b2aac2bc10ed41a8f006;p=linux-2.6

[NET_SCHED]: Revert "HTB: fix incorrect use of RB_EMPTY_NODE"

With commit 10fd48f2376db52f08bf0420d2c4f580e39269e1 [1] ,  RB_EMPTY_NODE
changed behaviour so it returns true when the node is empty as expected.
Hence Patrick McHardy's fix for sched_htb.c should be reverted.

Signed-off-by: Ismail Donmez <ismail@pardus.org.tr>
ACKed-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 6c058e3660..bb3ddd4784 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);