summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Dill <Russ.Dill@asu.edu>2008-01-11 01:16:28 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-06 11:43:41 -0800
commit2e1c89f5df933e882e629818d9e1e63ed83b61a2 (patch)
tree13ad0773f83bc063431cfa472c859dd0fb687427
parentc6b745a41e6b6e15cf637db23f054d85ca3cff31 (diff)
downloadlwn-2e1c89f5df933e882e629818d9e1e63ed83b61a2.tar.gz
lwn-2e1c89f5df933e882e629818d9e1e63ed83b61a2.zip
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>
-rw-r--r--drivers/net/usb/kaweth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 60d29440f316..4ebb6ea6eb5d 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