[NET_SCHED]: Revert "HTB: fix incorrect use of RB_EMPTY_NODE"
authorIsmail Donmez <ismail@pardus.org.tr>
Tue, 3 Oct 2006 20:49:10 +0000 (13:49 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 4 Oct 2006 07:30:58 +0000 (00:30 -0700)
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>
net/sched/sch_htb.c

index 6c058e3660c0c28ec9e6d85cd79f92c94c391539..bb3ddd4784b1cebfd4668dc15df844b484b36267 100644 (file)
@@ -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);