diff options
| author | Russ Dill <Russ.Dill@asu.edu> | 2008-01-07 21:48:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-08 23:30:15 -0800 |
| commit | 2b2b2e35b71e5be8bc06cc0ff38df15dfedda19b (patch) | |
| tree | f2916f1b360447bd74d65f21aee4334b167b1e8f /drivers/net/usb | |
| parent | 204246596b8b51c0ba44420e60f60561101b2b31 (diff) | |
| download | op-kernel-dev-2b2b2e35b71e5be8bc06cc0ff38df15dfedda19b.zip op-kernel-dev-2b2b2e35b71e5be8bc06cc0ff38df15dfedda19b.tar.gz | |
[NET]: kaweth was forgotten in msec switchover of usb_start_wait_urb
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>
Diffstat (limited to 'drivers/net/usb')
| -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 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 |
