* [Kernel-janitors] Re: [PATCH] usb/usbnet: replace
2004-07-28 5:23 [Kernel-janitors] Re: [PATCH] usb/usbnet: replace David Brownell
@ 2004-07-28 15:54 ` Nishanth Aravamudan
2004-07-28 19:35 ` Nishanth Aravamudan
2004-08-02 21:26 ` Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Nishanth Aravamudan @ 2004-07-28 15:54 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
On Tue, Jul 27, 2004 at 10:23:48PM -0700, David Brownell wrote:
> Nishanth Aravamudan wrote:
> >I would appreciate any comments from the janitors list.
> >
> >Applys-to: 2.6.7
> >
> >Description: Use msleep() instead of schedule_timeout() to
> >guarantee the task delays for the desired time.
>
> Please define and use UNLINK_TIMEOUT_MS, instead.
> Or better yet, switch to wait_event() ...
Please find the first of these changes below. Thanks.
--- linux-vanilla/drivers/usb/net/usbnet.c 2004-06-15 22:19:31.000000000 -0700
+++ linux-dev/drivers/usb/net/usbnet.c 2004-07-28 08:52:16.000000000 -0700
@@ -165,7 +165,8 @@
// between wakeups
#define UNLINK_TIMEOUT_JIFFIES ((3 /*ms*/ * HZ)/1000)
-
+#define UNLINK_TIMEOUT_MS 3
+
/*-------------------------------------------------------------------------*/
// randomly generated ethernet address
@@ -2550,8 +2551,7 @@ static int usbnet_stop (struct net_devic
while (skb_queue_len (&dev->rxq)
&& skb_queue_len (&dev->txq)
&& skb_queue_len (&dev->done)) {
- set_current_state (TASK_UNINTERRUPTIBLE);
- schedule_timeout (UNLINK_TIMEOUT_JIFFIES);
+ msleep(UNLINK_TIMEOUT_MS);
devdbg (dev, "waited for %d urb completions", temp);
}
dev->wait = 0;
[-- 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] 4+ messages in thread* [Kernel-janitors] Re: [PATCH] usb/usbnet: replace
2004-07-28 5:23 [Kernel-janitors] Re: [PATCH] usb/usbnet: replace David Brownell
2004-07-28 15:54 ` Nishanth Aravamudan
@ 2004-07-28 19:35 ` Nishanth Aravamudan
2004-08-02 21:26 ` Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Nishanth Aravamudan @ 2004-07-28 19:35 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1720 bytes --]
On Wed, Jul 28, 2004 at 08:54:34AM -0700, Nishanth Aravamudan wrote:
> On Tue, Jul 27, 2004 at 10:23:48PM -0700, David Brownell wrote:
> > Nishanth Aravamudan wrote:
> > >I would appreciate any comments from the janitors list.
> > >
> > >Applys-to: 2.6.7
> > >
> > >Description: Use msleep() instead of schedule_timeout() to
> > >guarantee the task delays for the desired time.
> >
> > Please define and use UNLINK_TIMEOUT_MS, instead.
> > Or better yet, switch to wait_event() ...
>
> Please find the first of these changes below. Thanks.
The previous patch inserted extraneous whitespace. Please find the
corrected version below. Also, the unused UNLINK_TIMEOUT_JIFFIES is
removed.
-Nish
Applys-to: 2.6.7
Description: Use msleep() instead of schedule_timeout() to guarantee the
task delays for the desired time. Delete unused UNLINK_TIMEOUT_JIFFIES
#define.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- linux-vanilla/drivers/usb/net/usbnet.c 2004-06-15 22:19:31.000000000 -0700
+++ linux-dev/drivers/usb/net/usbnet.c 2004-07-28 12:33:16.000000000 -0700
@@ -164,7 +164,7 @@
#define CONTROL_TIMEOUT_JIFFIES ((CONTROL_TIMEOUT_MS * HZ)/1000)
// between wakeups
-#define UNLINK_TIMEOUT_JIFFIES ((3 /*ms*/ * HZ)/1000)
+#define UNLINK_TIMEOUT_MS 3
/*-------------------------------------------------------------------------*/
@@ -2550,8 +2550,7 @@ static int usbnet_stop (struct net_devic
while (skb_queue_len (&dev->rxq)
&& skb_queue_len (&dev->txq)
&& skb_queue_len (&dev->done)) {
- set_current_state (TASK_UNINTERRUPTIBLE);
- schedule_timeout (UNLINK_TIMEOUT_JIFFIES);
+ msleep(UNLINK_TIMEOUT_MS);
devdbg (dev, "waited for %d urb completions", temp);
}
dev->wait = 0;
[-- 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] 4+ messages in thread* [Kernel-janitors] Re: [PATCH] usb/usbnet: replace
2004-07-28 5:23 [Kernel-janitors] Re: [PATCH] usb/usbnet: replace David Brownell
2004-07-28 15:54 ` Nishanth Aravamudan
2004-07-28 19:35 ` Nishanth Aravamudan
@ 2004-08-02 21:26 ` Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2004-08-02 21:26 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
On Wed, Jul 28, 2004 at 12:35:59PM -0700, Nishanth Aravamudan wrote:
> On Wed, Jul 28, 2004 at 08:54:34AM -0700, Nishanth Aravamudan wrote:
> > On Tue, Jul 27, 2004 at 10:23:48PM -0700, David Brownell wrote:
> > > Nishanth Aravamudan wrote:
> > > >I would appreciate any comments from the janitors list.
> > > >
> > > >Applys-to: 2.6.7
> > > >
> > > >Description: Use msleep() instead of schedule_timeout() to
> > > >guarantee the task delays for the desired time.
> > >
> > > Please define and use UNLINK_TIMEOUT_MS, instead.
> > > Or better yet, switch to wait_event() ...
> >
> > Please find the first of these changes below. Thanks.
>
> The previous patch inserted extraneous whitespace. Please find the
> corrected version below. Also, the unused UNLINK_TIMEOUT_JIFFIES is
> removed.
>
> -Nish
>
> Applys-to: 2.6.7
>
> Description: Use msleep() instead of schedule_timeout() to guarantee the
> task delays for the desired time. Delete unused UNLINK_TIMEOUT_JIFFIES
> #define.
>
> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Applied, thanks.
greg k-h
[-- 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] 4+ messages in thread