diff options
| author | Balakumaran Kannan <kumaran.4353@gmail.com> | 2014-04-09 09:03:45 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-09 13:03:53 -0400 |
| commit | fa8cddaf903c0e010ff2de210ea4974fa30603ef (patch) | |
| tree | 39f4ca7f6acac8c8bb97bacbc37743bb42a86f5e /drivers/net/phy/phy.c | |
| parent | 1e1cdf8ac78793e0875465e98a648df64694a8d0 (diff) | |
| download | linux-fa8cddaf903c0e010ff2de210ea4974fa30603ef.tar.bz2 | |
net phylib: Remove unnecessary condition check in phy
This condition check makes no difference in the code flow since 3.10
Signed-off-by: Balakumaran Kannan <kumaran.4353@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -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) netif_carrier_on(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev); - } else if (0 == phydev->link_timeout--) { + } else if (0 == phydev->link_timeout--) needs_aneg = 1; - /* If we have the magic_aneg bit, we try again */ - if (phydev->drv->flags & PHY_HAS_MAGICANEG) - break; - } break; case PHY_NOLINK: err = phy_read_status(phydev); |