Received: with ECARTIS (v1.0.0; list netdev); Tue, 06 Jul 2004 00:05:20 -0700 (PDT) Received: from mx03.cybersurf.com (mx03.cybersurf.com [209.197.145.106]) by oss.sgi.com (8.12.10/8.12.9) with SMTP id i6675Bgi028807 for ; Tue, 6 Jul 2004 00:05:11 -0700 Received: from mail.cyberus.ca ([209.197.145.21]) by mx03.cybersurf.com with esmtp (Exim 4.20) id 1BgkhM-0006j6-BJ for netdev@oss.sgi.com; Sat, 03 Jul 2004 09:36:56 -0400 Received: from cpe0030ab124d2f-cm014500000962.cpe.net.cable.rogers.com ([24.103.99.32] helo=[10.0.0.21]) by mail.cyberus.ca with esmtp (Exim 4.20) id 1BgkhK-0006bf-0j; Sat, 03 Jul 2004 09:36:54 -0400 Subject: bk16 changes to cbq From: jamal Reply-To: hadi@cyberus.ca To: Alexey , "David S. Miller" Cc: Stephen Hemminger , netdev@oss.sgi.com Content-Type: text/plain Organization: jamalopolis Message-Id: <1088861810.1039.298.camel@jzny.localdomain> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 Date: 03 Jul 2004 09:36:50 -0400 Content-Transfer-Encoding: 7bit X-archive-position: 6647 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: hadi@cyberus.ca Precedence: bulk X-list: netdev Content-Length: 916 Lines: 27 I am noticing this in bk16; it may be one of the changes that came from Stephen recently.. --- a/net/sched/sch_cbq.c 2004-02-20 18:37:25 -08:00 +++ b/net/sched/sch_cbq.c 2004-06-18 13:51:18 -07:00 @@ -1054,7 +1054,7 @@ if (sch->q.qlen) { sch->stats.overlimits++; - if (q->wd_expires && !netif_queue_stopped(sch->dev)) { + if (q->wd_expires) { long delay = PSCHED_US2JIFFIE(q->wd_expires); if (delay <= 0) delay = 1; What i remember is this (4-5 years back) used to cure a bug - cant remember the details unfortunately, but Alexey may remember. I am hoping removal of the above line implies that those conditions dont exist anymore? At the expense of repeating a discussion that may have already happened, what was the logic for removing this line? cheers, jamal