Skip to contentSkip to conversation

net phylib: Remove unnecessary condition check in phy

PATCH Applied Balakumaran Kannan 2 participants 2 messages Apr 9, 2014

Subsystems (3)
Networking Network drivers Ethernet PHY
lore
Share & tools
lore

Balakumaran Kannan

author
#0 lore raw

PATCH v3 1/1 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]>
---
 drivers/net/phy/phy.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/phy/phy.c +1 -5
index 1d788f1..1b6d09a 100644
@@ -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);
Signature · 1 line
1.7.9.5