diff options
| author | Ismail Donmez <ismail@pardus.org.tr> | 2006-10-03 22:49:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-10-04 09:30:58 +0200 |
| commit | 81771b3b20fb4e98c6f2b2aac2bc10ed41a8f006 (patch) | |
| tree | 734cd7dc9859da043b8912aeb86ccf767475d9a9 /net | |
| parent | [NETFILTER]: ebt_mark: add or/and/xor action support to mark target (diff) | |
| download | linux-81771b3b20fb4e98c6f2b2aac2bc10ed41a8f006.tar.xz linux-81771b3b20fb4e98c6f2b2aac2bc10ed41a8f006.zip | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_htb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 6c058e3660c0..bb3ddd4784b1 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); |