diff options
| -rw-r--r-- | drivers/net/phy/phy.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1d788f19135b..1b6d09aef427 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c | |||
| @@ -756,12 +756,8 @@ void phy_state_machine(struct work_struct *work) | |||
| 756 | netif_carrier_on(phydev->attached_dev); | 756 | netif_carrier_on(phydev->attached_dev); |
| 757 | phydev->adjust_link(phydev->attached_dev); | 757 | phydev->adjust_link(phydev->attached_dev); |
| 758 | 758 | ||
| 759 | } else if (0 == phydev->link_timeout--) { | 759 | } else if (0 == phydev->link_timeout--) |
| 760 | needs_aneg = 1; | 760 | needs_aneg = 1; |
| 761 | /* If we have the magic_aneg bit, we try again */ | ||
| 762 | if (phydev->drv->flags & PHY_HAS_MAGICANEG) | ||
| 763 | break; | ||
| 764 | } | ||
| 765 | break; | 761 | break; |
| 766 | case PHY_NOLINK: | 762 | case PHY_NOLINK: |
| 767 | err = phy_read_status(phydev); | 763 | err = phy_read_status(phydev); |
