diff options
| author | Russ Dill <Russ.Dill@asu.edu> | 2008-01-11 01:16:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-08 12:01:20 -0800 |
| commit | 37e82ef19ffc9d6c4f648e6b38383299de8c79b9 (patch) | |
| tree | 51f94d52f19dff34770fab20df8aef8bc28cc17d /drivers | |
| parent | d80f0b526695c5950ce114d2613d5d081b42f2d2 (diff) | |
NET: kaweth was forgotten in msec switchover of usb_start_wait_urb
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 524dc5f5e46..9057d7151ac 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 |