diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-06 22:29:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-06 22:29:20 -0500 |
| commit | 44d84d7272e5848878a96029b8a8b6e86854f146 (patch) | |
| tree | 91b188c0ae21255510ace7507d42cdf0e8f6f5ae /drivers/net/ethernet/intel/e100.c | |
| parent | de7b5b3d790a2524c3f992d357983600635c441b (diff) | |
| parent | bdec41963890f8ed9ad89f8b418959ab3cdc2aa3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/intel/e100.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 781065eb5431..e9c3a87e5b11 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -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); |