Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / lib82596.c

diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index c27f4291b350422978ab9fbf55bd6318ec0953ae..9e042894479b6c5e74d9ef28c4540c2370bad0a9 100644 (file)
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -161,7 +161,7 @@ enum commands {
 #define         RX_SUSPEND     0x0030
 #define         RX_ABORT       0x0040
 
-#define TX_TIMEOUT     5
+#define TX_TIMEOUT     (HZ/20)
 
 
 struct i596_reg {