diff options
| author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2009-09-25 16:17:44 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-27 07:15:36 +0400 |
| commit | be0f071956e2142e2e88e9d6d5655ba1c75d07c8 (patch) | |
| tree | e0b1be3f259841aaabcfbb02c4495dd2580d0130 /drivers/net/e1000/e1000_ethtool.c | |
| parent | baa34745fe6263c733f43feddb0b8100d6538f37 (diff) | |
| download | linux-be0f071956e2142e2e88e9d6d5655ba1c75d07c8.tar.xz | |
e1000: test link state conclusively
e1000 was using one particular way to detect link, but with the advent
of some of the newer hardware designs using SERDES connections, tests
for link must completely cover all cases.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
| -rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index f2e756f069c6..490b2b7cd3ab 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c @@ -1481,13 +1481,13 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data) *data = 0; if (hw->media_type == e1000_media_type_internal_serdes) { int i = 0; - hw->serdes_link_down = true; + hw->serdes_has_link = false; /* On some blade server designs, link establishment * could take as long as 2-3 minutes */ do { e1000_check_for_link(hw); - if (!hw->serdes_link_down) + if (hw->serdes_has_link) return *data; msleep(20); } while (i++ < 3750); |