diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-22 14:23:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-22 14:23:43 -0700 |
| commit | bba6ec7e4963e30366359686f34e5bdb00b1a066 (patch) | |
| tree | 05c44b6b99e46d876b144065537dd8673d07b162 /drivers/net/ethernet/intel/igb/igb_main.c | |
| parent | 1304a7343b30fc4f16045412efdbb4179a3d9255 (diff) | |
| parent | 8376dad0c877bc691b2feadd3390a162aa3c3bd9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ethtool.h, e1000, e1000e, and igb to
implement MDI/MDIx control.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 4 |
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 48cc4fb1a30..73cc273ef98 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -6675,6 +6675,10 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx) default: goto err_inval; } + + /* clear MDI, MDI(-X) override is only allowed when autoneg enabled */ + adapter->hw.phy.mdix = AUTO_ALL_MODES; + return 0; err_inval: |