diff options
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 19791518f6ae..8a6ea1970ea7 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -3595,18 +3595,17 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl) | |||
3595 | if (err) | 3595 | if (err) |
3596 | goto done; | 3596 | goto done; |
3597 | 3597 | ||
3598 | if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY) | 3598 | if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) { |
3599 | goto done; | 3599 | new_adv = ethtool_adv_to_mii_ctrl1000_t(advertise); |
3600 | |||
3601 | new_adv = ethtool_adv_to_mii_ctrl1000_t(advertise); | ||
3602 | 3600 | ||
3603 | if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 || | 3601 | if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 || |
3604 | tp->pci_chip_rev_id == CHIPREV_ID_5701_B0) | 3602 | tp->pci_chip_rev_id == CHIPREV_ID_5701_B0) |
3605 | new_adv |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER; | 3603 | new_adv |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER; |
3606 | 3604 | ||
3607 | err = tg3_writephy(tp, MII_CTRL1000, new_adv); | 3605 | err = tg3_writephy(tp, MII_CTRL1000, new_adv); |
3608 | if (err) | 3606 | if (err) |
3609 | goto done; | 3607 | goto done; |
3608 | } | ||
3610 | 3609 | ||
3611 | if (!(tp->phy_flags & TG3_PHYFLG_EEE_CAP)) | 3610 | if (!(tp->phy_flags & TG3_PHYFLG_EEE_CAP)) |
3612 | goto done; | 3611 | goto done; |