* [PATCH] [NET] kaweth was forgotten in msec switchover of usb_start_wait_urb
@ 2008-01-07 23:20 Russell Dill
2008-01-08 5:48 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Russell Dill @ 2008-01-07 23:20 UTC (permalink / raw)
To: Michael Zappe, Stephane Alnet, Brad Hards, Oliver Neukum; +Cc: netdev
Back in 2.6.12-pre, usb_start_wait_urb was switched over to take
milliseconds instead of jiffies. kaweth.c was never updated to match.
Signed-off-by: Russ Dill <Russ.Dill@asu.edu>
---
drivers/net/usb/kaweth.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 58a53a6..569ad8b 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -70,7 +70,7 @@
#define KAWETH_TX_TIMEOUT (5 * HZ)
#define KAWETH_SCRATCH_SIZE 32
#define KAWETH_FIRMWARE_BUF_SIZE 4096
-#define KAWETH_CONTROL_TIMEOUT (30 * HZ)
+#define KAWETH_CONTROL_TIMEOUT (30000)
#define KAWETH_STATUS_BROKEN 0x0000001
#define KAWETH_STATUS_CLOSING 0x0000002
--
1.5.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] [NET] kaweth was forgotten in msec switchover of usb_start_wait_urb
2008-01-07 23:20 [PATCH] [NET] kaweth was forgotten in msec switchover of usb_start_wait_urb Russell Dill
@ 2008-01-08 5:48 ` David Miller
2008-01-08 7:09 ` [NET] mcs7830 passes msecs instead of jiffies to usb_control_msg Russ Dill
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2008-01-08 5:48 UTC (permalink / raw)
To: Russ.Dill, russd; +Cc: zapman, stephane, bhards, oliver, netdev
From: "Russell Dill" <russd@asu.edu>
Date: Mon, 7 Jan 2008 16:20:20 -0700
> Back in 2.6.12-pre, usb_start_wait_urb was switched over to take
> milliseconds instead of jiffies. kaweth.c was never updated to match.
>
> Signed-off-by: Russ Dill <Russ.Dill@asu.edu>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [NET] mcs7830 passes msecs instead of jiffies to usb_control_msg
2008-01-08 5:48 ` David Miller
@ 2008-01-08 7:09 ` Russ Dill
2008-01-08 7:16 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Russ Dill @ 2008-01-08 7:09 UTC (permalink / raw)
To: David Miller; +Cc: netdev
usb_control_msg was changed long ago (2.6.12-pre) to take milliseconds
instead of jiffies. Oddly, mcs7830 wasn't added until 2.6.19-rc3.
Signed-off-by: Russ Dill <Russ.Dill@asu.edu>
---
drivers/net/usb/mcs7830.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index f55a595..5ea7411 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -94,7 +94,7 @@ static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data)
ret = usb_control_msg(xdev, usb_rcvctrlpipe(xdev, 0), MCS7830_RD_BREQ,
MCS7830_RD_BMREQ, 0x0000, index, data,
- size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT));
+ size, MCS7830_CTRL_TIMEOUT);
return ret;
}
@@ -105,7 +105,7 @@ static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, void *data)
ret = usb_control_msg(xdev, usb_sndctrlpipe(xdev, 0), MCS7830_WR_BREQ,
MCS7830_WR_BMREQ, 0x0000, index, data,
- size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT));
+ size, MCS7830_CTRL_TIMEOUT);
return ret;
}
--
1.5.3.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [NET] mcs7830 passes msecs instead of jiffies to usb_control_msg
2008-01-08 7:09 ` [NET] mcs7830 passes msecs instead of jiffies to usb_control_msg Russ Dill
@ 2008-01-08 7:16 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2008-01-08 7:16 UTC (permalink / raw)
To: Russ.Dill; +Cc: netdev
From: Russ Dill <Russ.Dill@asu.edu>
Date: Tue, 08 Jan 2008 00:09:39 -0700
> usb_control_msg was changed long ago (2.6.12-pre) to take milliseconds
> instead of jiffies. Oddly, mcs7830 wasn't added until 2.6.19-rc3.
>
> Signed-off-by: Russ Dill <Russ.Dill@asu.edu>
Applied, thanks Russ.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-01-08 7:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-07 23:20 [PATCH] [NET] kaweth was forgotten in msec switchover of usb_start_wait_urb Russell Dill
2008-01-08 5:48 ` David Miller
2008-01-08 7:09 ` [NET] mcs7830 passes msecs instead of jiffies to usb_control_msg Russ Dill
2008-01-08 7:16 ` David Miller
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).