* [KJ] [PATCH] net/3c505: replace schedule_timeout() with msleep()
@ 2005-05-02 6:14 Nishanth Aravamudan
2005-05-02 6:34 ` [KJ] [PATCH] net/slip: replace schedule_timeout() with msleep_interruptible() Nishanth Aravamudan
0 siblings, 1 reply; 2+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:14 UTC (permalink / raw)
To: philb; +Cc: netdev, Kernel-Janitors
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
Use msleep() instead of schedule_timeout() to guarantee the task delays
as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.12-rc3/drivers/net/3c505.c 2005-04-29 11:03:04.000000000 -0700
+++ 2.6.12-rc3-dev/drivers/net/3c505.c 2005-05-01 20:52:01.000000000 -0700
@@ -1317,8 +1317,7 @@ static int __init elp_sense(struct net_d
if (orig_HSR & DIR) {
/* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */
outb(0, dev->base_addr + PORT_CONTROL);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(30*HZ/100);
+ msleep(300);
if (inb_status(addr) & DIR) {
if (elp_debug > 0)
printk(notfound_msg, 2);
@@ -1327,8 +1326,7 @@ static int __init elp_sense(struct net_d
} else {
/* If HCR.DIR is down, we pull it up. HSR.DIR should follow. */
outb(DIR, dev->base_addr + PORT_CONTROL);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(30*HZ/100);
+ msleep(300);
if (!(inb_status(addr) & DIR)) {
if (elp_debug > 0)
printk(notfound_msg, 3);
[-- 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [KJ] [PATCH] net/slip: replace schedule_timeout() with msleep_interruptible()
2005-05-02 6:14 [KJ] [PATCH] net/3c505: replace schedule_timeout() with msleep() Nishanth Aravamudan
@ 2005-05-02 6:34 ` Nishanth Aravamudan
0 siblings, 0 replies; 2+ messages in thread
From: Nishanth Aravamudan @ 2005-05-02 6:34 UTC (permalink / raw)
To: loz, waltje; +Cc: netdev, Kernel-Janitors
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
Use msleep_interruptible() instead of schedule_timeout() to guarantee
the task delays as expected.
--- 2.6.12-rc3/drivers/net/slip.c 2005-03-01 23:38:33.000000000 -0800
+++ 2.6.12-rc3-dev/drivers/net/slip.c 2005-05-01 20:53:08.000000000 -0700
@@ -1395,10 +1395,8 @@ static void __exit slip_exit(void)
/* First of all: check for active disciplines and hangup them.
*/
do {
- if (busy) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
- }
+ if (busy)
+ msleep_interruptible(100);
busy = 0;
for (i = 0; i < slip_maxdev; i++) {
[-- 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-05-02 6:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-02 6:14 [KJ] [PATCH] net/3c505: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-05-02 6:34 ` [KJ] [PATCH] net/slip: replace schedule_timeout() with msleep_interruptible() Nishanth Aravamudan
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).