]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[NET] kaweth was forgotten in msec switchover of usb_start_wait_urb
authorRuss Dill <Russ.Dill@asu.edu>
Tue, 15 Jan 2008 23:13:56 +0000 (01:13 +0200)
committerAdrian Bunk <bunk@kernel.org>
Tue, 15 Jan 2008 23:13:56 +0000 (01:13 +0200)
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: Adrian Bunk <bunk@kernel.org>
drivers/usb/net/kaweth.c

index def3bb8e22901509bf35b618d14fb3402f8a2f43..71e77b5fdec40df2be367292a242704e5c5173f0 100644 (file)
@@ -82,7 +82,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