diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-07-23 20:07:40 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-26 18:46:42 +0200 |
commit | 099e1cb700da6359b784ac7fb65099091b7b961e (patch) | |
tree | 406c583a91978cad2de9d7ada171b98c7be30a63 /drivers/net/igb/e1000_82575.c | |
parent | igb: remove media type fiber as it is misleading (diff) | |
download | linux-099e1cb700da6359b784ac7fb65099091b7b961e.tar.xz linux-099e1cb700da6359b784ac7fb65099091b7b961e.zip |
igb: make serdes power down available for 82575 in addition to 82576 parts
There was a serdes power down workaround that was originally added for
82576 fiber. However it has also been found that this workaround is needed
for serdes connections as well. In addition it is also needed for 82575
serdes so we we need to remove the checks restricting it to 82576.
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/e1000_82575.c')
-rw-r--r-- | drivers/net/igb/e1000_82575.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index bd3efdb95c64..fa4a76299e00 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c @@ -866,8 +866,7 @@ void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw) { u32 reg; - if (hw->mac.type != e1000_82576 || - hw->phy.media_type != e1000_media_type_internal_serdes) + if (hw->phy.media_type != e1000_media_type_internal_serdes) return; /* if the management interface is not enabled, then power down */ @@ -1228,10 +1227,6 @@ out: static bool igb_sgmii_active_82575(struct e1000_hw *hw) { struct e1000_dev_spec_82575 *dev_spec = &hw->dev_spec._82575; - - if (hw->mac.type != e1000_82575 && hw->mac.type != e1000_82576) - return false; - return dev_spec->sgmii_active; } |