Commit 5661aeb0 authored Feb 25, 2011 by Bruce Allan Committed by Jeff Kirsher Mar 11, 2011

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>

parent d8d5f8ae

drivers/net/e1000e/ethtool.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -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;