aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c515.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-11-03 22:49:35 +0000
committerDavid S. Miller <davem@davemloft.net>2010-11-09 09:17:56 -0800
commitc63fdf46ad0a7f8fe3c0252a0e763515617e0ea7 (patch)
tree3b0c763708d6c92b48eb6f05a0d9a8a2cc3f4655 /drivers/net/3c515.c
parentaf_unix: optimize unix_dgram_poll() (diff)
downloadlinux-dev-c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7.tar.xz
linux-dev-c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7.zip
drivers/net: normalize TX_TIMEOUT
Some network drivers use old TX_TIMEOUT definitions, assuming HZ=100 of old kernels. Convert these definitions to include HZ, since HZ can be 1000 these days. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/3c515.c')
-rw-r--r--drivers/net/3c515.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index cdf7226a7c43..d2bb4b254c57 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -98,7 +98,7 @@ static int rx_nocopy, rx_copy, queued_packet;
#define WAIT_TX_AVAIL 200
/* Operational parameter that usually are not changed. */
-#define TX_TIMEOUT 40 /* Time in jiffies before concluding Tx hung */
+#define TX_TIMEOUT ((4*HZ)/10) /* Time in jiffies before concluding Tx hung */
/* The size here is somewhat misleading: the Corkscrew also uses the ISA
aliased registers at <base>+0x400.