From: Eran Mann Current e100.c doesn't follow the EEPROM configuration regarding Auto MDI/MDI-X switching, instead it is enabled unconditionally for the relevant chips. This is especially bad since according to Intel's errata this feature is no-longer supported. Signed-off-by: Eran Mann Signed-off-by: Andrew Morton --- 25-akpm/drivers/net/e100.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff -puN drivers/net/e100.c~e100-use-eeprom-config-for-auto-mdi-mdi-x drivers/net/e100.c --- 25/drivers/net/e100.c~e100-use-eeprom-config-for-auto-mdi-mdi-x Wed Mar 30 15:36:23 2005 +++ 25-akpm/drivers/net/e100.c Wed Mar 30 15:36:23 2005 @@ -1078,13 +1078,17 @@ static int e100_phy_init(struct nic *nic mdio_write(netdev, nic->mii.phy_id, MII_NSC_CONG, cong); } - 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))) - /* enable/disable MDI/MDI-X auto-switching */ - mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, - nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH); - + if(((nic->mac >= mac_82550_D102) || ((nic->flags & ich) && + (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & + 0x8000)))) { + /* Enable/Disable Auto MDI/MDI-X Switching */ + if ((nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled) && + !nic->mii.force_media) + mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, + NCONFIG_AUTO_SWITCH); + else + mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, 0); + } return 0; } @@ -2290,11 +2294,11 @@ static int __devinit e100_probe(struct p goto err_out_iounmap; } - e100_phy_init(nic); - if((err = e100_eeprom_load(nic))) goto err_out_free; + e100_phy_init(nic); + memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN); if(!is_valid_ether_addr(netdev->dev_addr)) { DPRINTK(PROBE, ERR, "Invalid MAC address from " _