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]>
AnTAVR · Apr 9, 2014 · fa8cdda · fa8cdda
1 parent 1e1cdf8
commit fa8cdda
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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);