Messages in this thread Patch in this message | | | Date | Fri, 1 Feb 2008 16:20:06 -0800 | From | Greg KH <> | Subject | [patch 05/27] NET: kaweth was forgotten in msec switchover of usb_start_wait_urb |
| |
2.6.22-stable review patch. If anyone has any objections, please let us know.
------------------ From: Russ Dill <Russ.Dill@asu.edu>
[NET]: kaweth was forgotten in msec switchover of usb_start_wait_urb
[ Upstream commit: 2b2b2e35b71e5be8bc06cc0ff38df15dfedda19b ]
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> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/net/usb/kaweth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- 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 --
| |