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 <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1d788f19135bdf5e59e71a11eed935981a172ca8..1b6d09aef42748bcbba6d4fe88ca68d6ea83c852 100644 (file)
--- 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);