pch_gbe: fix transmit watchdog timeout
authorAndy Cress <andycress@gmail.com>
Thu, 26 Jul 2012 05:59:07 +0000 (05:59 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Jul 2012 21:29:51 +0000 (14:29 -0700)
An extended ping test with 6 vlans resulted in a driver oops with a
netdev transmit timeout.
Fix WATCHDOG_TIMEOUT to be more like e1000e at 5 * HZ, to avoid
unnecessary transmit timeouts.

Signed-off-by: Andy Cress <andy.cress@us.kontron.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c

index 8e0e5f0..99bba29 100644 (file)
@@ -35,7 +35,7 @@ const char pch_driver_version[] = DRV_VERSION;
 #define DSC_INIT16                     0xC000
 #define PCH_GBE_DMA_ALIGN              0
 #define PCH_GBE_DMA_PADDING            2
-#define PCH_GBE_WATCHDOG_PERIOD                (1 * HZ)        /* watchdog time */
+#define PCH_GBE_WATCHDOG_PERIOD                (5 * HZ)        /* watchdog time */
 #define PCH_GBE_COPYBREAK_DEFAULT      256
 #define PCH_GBE_PCI_BAR                        1
 #define PCH_GBE_RESERVE_MEMORY         0x200000        /* 2MB */