@@ -81,7 +81,6 @@ struct e1000_info;
/* How many Rx Buffers do we bundle into one write to the hardware ? */
#define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */
-#define AUTO_ALL_MODES 0
#define E1000_EEPROM_APME 0x0400
#define E1000_MNG_VLAN_NONE (-1)
@@ -285,6 +285,10 @@ static int e1000_set_settings(struct net_device *netdev,
}
}
+ /* MDI-X => 2; MDI =>1; Auto =>0 */
+ if (ecmd->eth_tp_mdix && (hw->phy.media_type == e1000_media_type_copper))
+ hw->phy.mdix = ecmd->eth_tp_mdix;
+
/* reset the link */
if (netif_running(adapter->netdev)) {
@@ -5842,7 +5842,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
/* Copper options */
if (adapter->hw.phy.media_type == e1000_media_type_copper) {
- adapter->hw.phy.mdix = AUTO_ALL_MODES;
+ adapter->hw.phy.mdix = ETH_TP_MDI_INVALID;
adapter->hw.phy.disable_polarity_correction = 0;
adapter->hw.phy.ms_type = e1000_ms_hw_default;
}
some users report issues with link failing when connected to certain switches. This gives the user the ability to control the MDI-X state from the driver. This is in regards to the related ethtool patch and bugzilla.kernel.org bug 11998 Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> CC: bruce.w.allan@intel.com CC: n.poppelier@xs4all.nl CC: bastien@durel.org CC: jsveiga@it.eng.br --- drivers/net/e1000e/e1000.h | 1 - drivers/net/e1000e/ethtool.c | 4 ++++ drivers/net/e1000e/netdev.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html