diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-01-31 00:53:18 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-31 00:53:18 -0800 |
| commit | 5d0932a5dd00d83df5d1e15eeffb6edf015a8579 (patch) | |
| tree | 78d37cc9b58084a27d51af321b15f1dee4593700 /drivers/net/igb | |
| parent | ec54d7d6e40b04c16dfce0e41e506198a20c8645 (diff) | |
| download | blackbird-op-linux-5d0932a5dd00d83df5d1e15eeffb6edf015a8579.tar.gz blackbird-op-linux-5d0932a5dd00d83df5d1e15eeffb6edf015a8579.zip | |
igb: fix link reporting when using sgmii
When using sgmii the link was not being properly passed up to the driver
from the underlying link management functions. This change corrects it so
that get_link_status is cleared when a link has been found.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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/igb')
| -rw-r--r-- | drivers/net/igb/e1000_82575.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index f5e2e7235fcb..13ca73f96ec6 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c @@ -699,11 +699,18 @@ static s32 igb_check_for_link_82575(struct e1000_hw *hw) /* SGMII link check is done through the PCS register. */ if ((hw->phy.media_type != e1000_media_type_copper) || - (igb_sgmii_active_82575(hw))) + (igb_sgmii_active_82575(hw))) { ret_val = igb_get_pcs_speed_and_duplex_82575(hw, &speed, &duplex); - else + /* + * Use this flag to determine if link needs to be checked or + * not. If we have link clear the flag so that we do not + * continue to check for link. + */ + hw->mac.get_link_status = !hw->mac.serdes_has_link; + } else { ret_val = igb_check_for_copper_link(hw); + } return ret_val; } |
