Commit 81771b3b authored by Ismail Donmez's avatar Ismail Donmez Committed by David S. Miller

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

With commit 10fd48f2 [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: default avatarIsmail Donmez <ismail@pardus.org.tr>
ACKed-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b18dfa90
...@@ -391,7 +391,7 @@ static inline void htb_add_class_to_row(struct htb_sched *q, ...@@ -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 */ /* 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) 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); WARN_ON(1);
} else { } else {
rb_erase(rb, root); rb_erase(rb, root);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment