From: Ismail Donmez <ismail@pardus.org.tr>
To: netdev@vger.kernel.org
Cc: axboe@suse.de, "David S. Miller" <davem@davemloft.net>,
Patrick McHardy <kaber@trash.net>
Subject: [PATCH] Revert [NET_SCHED]: HTB: fix incorrect use of RB_EMPTY_NODE
Date: Sun, 1 Oct 2006 09:17:41 +0300 [thread overview]
Message-ID: <200610010917.42003.ismail@pardus.org.tr> (raw)
In-Reply-To: <200610010914.51623.ismail@pardus.org.tr>
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
This time with correct description too, *sigh*
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.
[1]
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=10fd48f2376db52f08bf0420d2c4f580e39269e1;hp=9817064b68fef7e4580c6df1ea597e106b9ff88b
Signed-off-by: Ismail Donmez <ismail@pardus.org.tr>
[-- Attachment #2: rb.diff --]
[-- Type: text/x-diff, Size: 454 bytes --]
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 6c058e3..1f1360e 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(
/* 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);
next prev parent reply other threads:[~2006-10-01 6:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-30 19:23 [PATCH] Revert [NET_SCHED]: HTB: fix incorrect use of RB_EMPTY_NODE Ismail Donmez
2006-09-30 19:25 ` Ismail Donmez
2006-10-01 1:52 ` Herbert Xu
2006-10-01 6:14 ` Ismail Donmez
2006-10-01 6:17 ` Ismail Donmez [this message]
2006-10-02 10:24 ` Jarek Poplawski
2006-10-02 11:15 ` Jarek Poplawski
2006-10-02 11:52 ` Jarek Poplawski
2006-10-03 10:28 ` Jens Axboe
2006-10-03 11:53 ` Jarek Poplawski
2006-10-03 12:54 ` Ismail Donmez
2006-10-03 18:05 ` Patrick McHardy
2006-10-03 20:49 ` David Miller
2006-10-02 13:49 ` Ismail Donmez
2006-10-03 7:27 ` Jarek Poplawski
2006-10-03 10:30 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200610010917.42003.ismail@pardus.org.tr \
--to=ismail@pardus.org.tr \
--cc=axboe@suse.de \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.