diff options
| author | Andy Cress <andycress@gmail.com> | 2012-07-26 05:59:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-26 14:29:51 -0700 |
| commit | 913f53e4c8a464c46a70898c88f2291ade28c196 (patch) | |
| tree | 139bb2be53625d368420d7a59f6af14aaab3ab68 /drivers | |
| parent | 9c50c0358f31f81dbcf7fa55089865f1efd9928d (diff) | |
| download | linux-3.10-913f53e4c8a464c46a70898c88f2291ade28c196.tar.gz linux-3.10-913f53e4c8a464c46a70898c88f2291ade28c196.tar.bz2 linux-3.10-913f53e4c8a464c46a70898c88f2291ade28c196.zip | |
pch_gbe: fix transmit watchdog timeout
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 8e0e5f0fb4f..99bba29e055 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -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 */ |