aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igb/igb_main.c
diff options
context:
space:
mode:
authorManfred Rudigier <manfred.rudigier@omicronenergy.com>2019-08-15 13:55:19 -0700
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-10-31 14:03:16 -0700
commitfb2308ba16bf1fd2cc3635172381e265fbfcb76d (patch)
tree95695a55e6028a811a6b68f48f98adba538be59c /drivers/net/ethernet/intel/igb/igb_main.c
parentigb/igc: Don't warn on fatal read failures when the device is removed (diff)
downloadlinux-dev-fb2308ba16bf1fd2cc3635172381e265fbfcb76d.tar.xz
linux-dev-fb2308ba16bf1fd2cc3635172381e265fbfcb76d.zip
igb: Enable media autosense for the i350.
This patch enables the hardware feature "Media Auto Sense" also on the i350. It works in the same way as on the 82850 devices. Hardware designs using dual PHYs (fiber/copper) can enable this feature by setting the MAS enable bits in the NVM_COMPAT register (0x03) in the EEPROM. Signed-off-by: Manfred Rudigier <manfred.rudigier@omicronenergy.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 31b9e02875cc..17a961c3d6e4 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2371,7 +2371,7 @@ void igb_reset(struct igb_adapter *adapter)
adapter->ei.get_invariants(hw);
adapter->flags &= ~IGB_FLAG_MEDIA_RESET;
}
- if ((mac->type == e1000_82575) &&
+ if ((mac->type == e1000_82575 || mac->type == e1000_i350) &&
(adapter->flags & IGB_FLAG_MAS_ENABLE)) {
igb_enable_mas(adapter);
}