commit eaf47b17a77fda841a1102d76c15161ee438b347
author Heiner Kallweit <hkallweit1@gmail.com> Wed May 30 22:13:20 2018 +0200
committer David S. Miller <davem@davemloft.net> Sun Jun 03 08:50:10 2018 -0400
tree f80e481d0371ed4bca8df4cdbe16ce8d55e4dd3f
parent 4cb160d0a63bb16718fc25c52fe51fe416a1f09e

net: phy: consider PHY_IGNORE_INTERRUPT in state machine PHY_NOLINK handling

We can bail out immediately also in case of PHY_IGNORE_INTERRUPT because
phy_mac_interupt() informs us once the link is up.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/phy/phy.c

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 05c1e8e..537297d 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -894,7 +894,7 @@ void phy_state_machine(struct work_struct *work)
 			needs_aneg = true;
 		break;
 	case PHY_NOLINK:
-		if (phy_interrupt_is_valid(phydev))
+		if (phydev->irq != PHY_POLL)
 			break;
 
 		err = phy_read_status(phydev);