From 3e82817dd3eaa51205975f6d7d0d6c9e75cce885 Mon Sep 17 00:00:00 2001 From: Andy Cress Date: Thu, 26 Jul 2012 05:59:07 +0000 Subject: [PATCH] --- yaml --- r: 318929 b: refs/heads/master c: 913f53e4c8a464c46a70898c88f2291ade28c196 h: refs/heads/master i: 318927: 0cbb4269043df395a6ef66097fd80bfc85d3f762 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5262cc50609e..fc6ddfe13599 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c50c0358f31f81dbcf7fa55089865f1efd9928d +refs/heads/master: 913f53e4c8a464c46a70898c88f2291ade28c196 diff --git a/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 8e0e5f0fb4fd..99bba29e0553 100644 --- a/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/trunk/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 */