aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igb/igb_main.c
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2012-07-25 22:31:19 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-08-21 04:27:48 -0400
commit8376dad0c877bc691b2feadd3390a162aa3c3bd9 (patch)
tree6629dabd710983dadfff0a6890c1d16c1a736987 /drivers/net/ethernet/intel/igb/igb_main.c
parent4e8186b68fb944ad9e7fd4080cd8bd8f10eb7cbd (diff)
igb: update to allow reading/setting MDI state
This is the implementation for igb to allow forcing MDI state via ethtool, allowing users to work around some improperly behaving switches. Forcing in this driver is for now only allowed when auto-neg is enabled. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> CC: Carolyn Wyborny <carolyn.wyborny@intel.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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index b7c2d5050572..d4f47a0f6689 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6676,6 +6676,10 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx)
6676 default: 6676 default:
6677 goto err_inval; 6677 goto err_inval;
6678 } 6678 }
6679
6680 /* clear MDI, MDI(-X) override is only allowed when autoneg enabled */
6681 adapter->hw.phy.mdix = AUTO_ALL_MODES;
6682
6679 return 0; 6683 return 0;
6680 6684
6681err_inval: 6685err_inval: