aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2011-02-25 06:36:25 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-03-11 02:03:35 -0800
commit5661aeb08edcef6799861f92817f593c1fd7b272 (patch)
tree1cbf6d455075e98a03fdadf059c696693bcd2cb6 /drivers/net/e1000e
parentd8d5f8aebb857f979fbe9099c9acc2ed486706be (diff)
downloadkernel_samsung_smdk4412-5661aeb08edcef6799861f92817f593c1fd7b272.zip
kernel_samsung_smdk4412-5661aeb08edcef6799861f92817f593c1fd7b272.tar.gz
kernel_samsung_smdk4412-5661aeb08edcef6799861f92817f593c1fd7b272.tar.bz2
e1000e: extend timeout for ethtool link test diagnostic
With some PHYs supported by this driver, link establishment can take a little longer when connected to certain switches. Extend the timeout to reduce the number of false diagnostic failures, and cleanup a code style issue in the same function. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r--drivers/net/e1000e/ethtool.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index d4e51aa..8e276dc 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1666,10 +1666,13 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
} else {
hw->mac.ops.check_for_link(hw);
if (hw->mac.autoneg)
- msleep(4000);
+ /*
+ * On some Phy/switch combinations, link establishment
+ * can take a few seconds more than expected.
+ */
+ msleep(5000);
- if (!(er32(STATUS) &
- E1000_STATUS_LU))
+ if (!(er32(STATUS) & E1000_STATUS_LU))
*data = 1;
}
return *data;