diff options
| author |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-08-16 11:28:14 -0700 |
|---|---|---|
| committer |   Auke Kok <juke-jan.h.kok@intel.com> | 2006-08-16 11:28:14 -0700 |
| commit | 60ffa478759f39a2eb3be1ed179bc3764804b2c8 (patch) | |
| tree | 6195728e45ff7228968a164e44f48bc8bd9b7ca9 /drivers/net/e100.c | |
| parent | [PATCH] smc91x: disable DMA mode on the logicpd pxa270 (diff) | |
| download | linux-dev-60ffa478759f39a2eb3be1ed179bc3764804b2c8.tar.xz linux-dev-60ffa478759f39a2eb3be1ed179bc3764804b2c8.zip | |
e100: Fix MDIO/MDIO-X
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@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 91ef5f2fd768..5de9843d972d 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -1391,15 +1391,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; |