aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/e1000_82575.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-07-23 14:07:40 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-26 12:46:42 -0400
commit099e1cb700da6359b784ac7fb65099091b7b961e (patch)
tree406c583a91978cad2de9d7ada171b98c7be30a63 /drivers/net/igb/e1000_82575.c
parentdcc3ae9a5252ea4ffe65b43cdc09ec2654b48000 (diff)
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.c7
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)
866{ 866{
867 u32 reg; 867 u32 reg;
868 868
869 if (hw->mac.type != e1000_82576 || 869 if (hw->phy.media_type != e1000_media_type_internal_serdes)
870 hw->phy.media_type != e1000_media_type_internal_serdes)
871 return; 870 return;
872 871
873 /* if the management interface is not enabled, then power down */ 872 /* if the management interface is not enabled, then power down */
@@ -1228,10 +1227,6 @@ out:
1228static bool igb_sgmii_active_82575(struct e1000_hw *hw) 1227static bool igb_sgmii_active_82575(struct e1000_hw *hw)
1229{ 1228{
1230 struct e1000_dev_spec_82575 *dev_spec = &hw->dev_spec._82575; 1229 struct e1000_dev_spec_82575 *dev_spec = &hw->dev_spec._82575;
1231
1232 if (hw->mac.type != e1000_82575 && hw->mac.type != e1000_82576)
1233 return false;
1234
1235 return dev_spec->sgmii_active; 1230 return dev_spec->sgmii_active;
1236} 1231}
1237 1232