The patch titled
e100: Fix MDIO/MDIO-X
has been removed from the -mm tree. Its filename is
e100-fix-mdio-mdio-x.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: e100: Fix MDIO/MDIO-X
From: "Kok, Auke" <auke-jan.h.kok@xxxxxxxxx>
MDIO/MDIO-X was broken due to a wrong errata. Removing the workaround code
fixes for affected NICs.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/e100.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff -puN drivers/net/e100.c~e100-fix-mdio-mdio-x drivers/net/e100.c
--- a/drivers/net/e100.c~e100-fix-mdio-mdio-x
+++ a/drivers/net/e100.c
@@ -1384,15 +1384,11 @@ static int e100_phy_init(struct nic *nic
}
if((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&
- (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000))) {
- /* enable/disable MDI/MDI-X auto-switching.
- MDI/MDI-X auto-switching is disabled for 82551ER/QM chips */
- if((nic->mac == mac_82551_E) || (nic->mac == mac_82551_F) ||
- (nic->mac == mac_82551_10) || (nic->mii.force_media) ||
- !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))
- mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, 0);
- else
- mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, NCONFIG_AUTO_SWITCH);
+ (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&
+ !(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);
}
return 0;
_
Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are
git-netdev-all.patch
e1000-memory-leak-in-e1000_set_ringparam.patch
e1000-ring-buffers-resources-cleanup.patch
e1000-irq-resources-cleanup.patch
e1000-e1000_probe-resources-cleanup.patch
ixgb-add-pci-error-recovery-callbacks.patch
e100-disable-device-on-pci-error.patch
e1000-disable-device-on-pci-error.patch
e1000_7033_dump_ring.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
