From: Nishanth Aravamudan <nacc@us.ibm.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: kernel-janitors@lists.osdl.org, netdev@oss.sgi.com
Subject: [KJ] [PATCH] net/pcnet32: replace schedule_timeout() with ssleep_interruptible()
Date: Mon, 1 Nov 2004 14:10:41 -0800 [thread overview]
Message-ID: <20041101221041.GB4255@us.ibm.com> (raw)
In-Reply-To: <4184C701.5030103@pobox.com>
[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]
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 <nacc@us.ibm.com>
--- 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 */
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
prev parent reply other threads:[~2004-11-01 22:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-30 22:42 [patch 11/18] net/pcnet32: replace schedule_timeout() with msleep_interruptible() janitor
2004-10-31 11:05 ` Jeff Garzik
2004-11-01 22:10 ` Nishanth Aravamudan [this message]
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=20041101221041.GB4255@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=jgarzik@pobox.com \
--cc=kernel-janitors@lists.osdl.org \
--cc=netdev@oss.sgi.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).