Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763368AbXEXFoa (ORCPT ); Thu, 24 May 2007 01:44:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757718AbXEXFoU (ORCPT ); Thu, 24 May 2007 01:44:20 -0400 Received: from stinky.trash.net ([213.144.137.162]:57870 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757533AbXEXFoT (ORCPT ); Thu, 24 May 2007 01:44:19 -0400 Message-ID: <4655256C.1030208@trash.net> Date: Thu, 24 May 2007 07:41:00 +0200 From: Patrick McHardy User-Agent: Debian Thunderbird 1.0.7 (X11/20051019) X-Accept-Language: en-us, en MIME-Version: 1.0 To: David Miller CC: mingo@elte.hu, herbert@gondor.apana.org.au, kernel@prachanda.info, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, tglx@linutronix.de, netdev@vger.kernel.org Subject: Re: bad networking related lag in v2.6.22-rc2 References: <46541DC4.4090501@trash.net> <20070523112559.GA24604@gondor.apana.org.au> <20070523114021.GA21880@elte.hu> <20070523.143056.115914753.davem@davemloft.net> In-Reply-To: <20070523.143056.115914753.davem@davemloft.net> X-Enigmail-Version: 0.93.0.0 Content-Type: multipart/mixed; boundary="------------030401070708020603050103" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1992 Lines: 64 This is a multi-part message in MIME format. --------------030401070708020603050103 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit David Miller wrote: >>* Herbert Xu wrote: >> >>>[NET_SCHED]: Fix qdisc_restart return value when dequeue is empty > > Applied, thanks everyone. Even though it didn't fix this problem, this patch I sent earlier is also needed. --------------030401070708020603050103 Content-Type: text/plain; name="x" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="x" [NET_SCHED]: sch_htb: fix event cache time calculation The event cache time must be an absolute value, when no event exists it is incorrectly set to 1s instead of 1s in the future. Signed-off-by: Patrick McHardy --- commit 49d1023ea0ea8377e740123d5954e88a00f78b7c tree 031c210f1b5e37ade5a4fa519f5808cd49225b89 parent 637fc540b0ad22bf7971929e906e704236af06cd author Patrick McHardy Mon, 21 May 2007 23:24:16 +0200 committer Patrick McHardy Mon, 21 May 2007 23:25:51 +0200 net/sched/sch_htb.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 99bcec8..035788c 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -976,8 +976,9 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) if (q->now >= q->near_ev_cache[level]) { event = htb_do_events(q, level); - q->near_ev_cache[level] = event ? event : - PSCHED_TICKS_PER_SEC; + if (!event) + event = q->now + PSCHED_TICKS_PER_SEC; + q->near_ev_cache[level] = event; } else event = q->near_ev_cache[level]; --------------030401070708020603050103-- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/