Received: with ECARTIS (v1.0.0; list netdev); Mon, 01 Nov 2004 14:11:23 -0800 (PST) Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.130]) by oss.sgi.com (8.13.0/8.13.0) with ESMTP id iA1MB9fx017614 for ; Mon, 1 Nov 2004 14:11:16 -0800 Received: from westrelay02.boulder.ibm.com (westrelay02.boulder.ibm.com [9.17.195.11]) by e32.co.us.ibm.com (8.12.10/8.12.9) with ESMTP id iA1MAiAd311986 for ; Mon, 1 Nov 2004 17:10:44 -0500 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by westrelay02.boulder.ibm.com (8.12.10/NCO/VER6.6) with ESMTP id iA1MAibN170534 for ; Mon, 1 Nov 2004 15:10:44 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id iA1MAhga008788 for ; Mon, 1 Nov 2004 15:10:44 -0700 Received: from localhost.localdomain (DYN318967BLD.beaverton.ibm.com [9.47.21.82]) by d03av02.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id iA1MAhZv008748; Mon, 1 Nov 2004 15:10:43 -0700 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.12.11/8.12.11/Debian-5) with ESMTP id iA1MAgc6004332; Mon, 1 Nov 2004 14:10:42 -0800 Received: (from nacc@localhost) by localhost.localdomain (8.12.11/8.12.11/Debian-5) id iA1MAfjR004329; Mon, 1 Nov 2004 14:10:41 -0800 X-Authentication-Warning: localhost.localdomain: nacc set sender to nacc@us.ibm.com using -f Date: Mon, 1 Nov 2004 14:10:41 -0800 From: Nishanth Aravamudan To: Jeff Garzik Cc: kernel-janitors@lists.osdl.org, netdev@oss.sgi.com Subject: [PATCH] net/pcnet32: replace schedule_timeout() with ssleep_interruptible() Message-ID: <20041101221041.GB4255@us.ibm.com> References: <4184C701.5030103@pobox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4184C701.5030103@pobox.com> X-Operating-System: Linux 2.6.9 (i686) User-Agent: Mutt/1.5.6+20040722i X-archive-position: 11311 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: nacc@us.ibm.com Precedence: bulk X-list: netdev Content-Length: 1399 Lines: 38 On Sun, Oct 31, 2004 at 06:05:37AM -0500, Jeff Garzik wrote: > janitor@sternwelten.at wrote: > >diff -puN drivers/net/pcnet32.c~msleep_interruptible-drivers_net_pcnet32 > >drivers/net/pcnet32.c > >--- > >linux-2.6.10-rc1/drivers/net/pcnet32.c~msleep_interruptible-drivers_net_pcnet32 2004-10-24 17:05:14.000000000 +0200 > >+++ linux-2.6.10-rc1-max/drivers/net/pcnet32.c 2004-10-24 > >17:05:14.000000000 +0200 > >@@ -847,7 +847,7 @@ static int pcnet32_phys_id(struct net_de > > if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))) > > data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ); > > > >- schedule_timeout(data * HZ); > >+ msleep_interruptible(data * 1000); > > > clearly and obviously ssleep() Here is the corrected patch. Description: Use ssleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan --- 2.6.10-rc1-vanilla/drivers/net/pcnet32.c 2004-10-30 15:33:28.000000000 -0700 +++ 2.6.10-rc1/drivers/net/pcnet32.c 2004-11-01 14:08:10.000000000 -0800 @@ -847,7 +847,7 @@ static int pcnet32_phys_id(struct net_de if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))) data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ); - schedule_timeout(data * HZ); + ssleep_interruptible(data); del_timer_sync(&lp->blink_timer); /* Restore the original value of the bcrs */