Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3566b52 authored by John W. Linville's avatar John W. Linville Committed by Jeff Kirsher
Browse files

e100: fix typo in MDI/MDI-X eeprom check in e100_phy_init 

Although it doesn't explicitly say so, commit 60ffa478 ("e100:
Fix MDIO/MDIO-X") appears to be intended to revert the earlier commit
64895145 ("e100: fixed e100 MDI/MDI-X issues").  However,
careful examination reveals that the attempted revert actually
_inverted_ the test for eeprom_mdix_enabled.  That is bound to program
a few PHYs incorrectly...

https://bugzilla.redhat.com/show_bug.cgi?id=1156417



Signed-off-by: default avatar"John W. Linville" <linville@tuxdriver.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2c90331c

drivers/net/ethernet/intel/e100.c

+1 −1
Original line number Diff line number Diff line
@@ -1543,7 +1543,7 @@ static int e100_phy_init(struct nic *nic) 
		mdio_write(netdev, nic->mii.phy_id, MII_BMCR, bmcr);

	} else if ((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&

	   (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&

		!(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {

		(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {

		/* enable/disable MDI/MDI-X auto-switching. */

		mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,

				nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);