Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ismail Donmez 2006-10-03 13:49:10 -07:00 committed by David S. Miller
parent b18dfa90c0
commit 81771b3b20
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/sched/sch_htb.c
View 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 */ /* 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);