Commit c6ac36be authored Jul 19, 2018 by Heiner Kallweit Committed by Greg Kroah-Hartman Jul 28, 2018

net: phy: consider PHY_IGNORE_INTERRUPT in phy_start_aneg_priv



[ Upstream commit 215d08a85b9acf5e1fe9dbf50f1774cde333efef ]

The situation described in the comment can occur also with
PHY_IGNORE_INTERRUPT, therefore change the condition to include it.

Fixes: f555f34fdc58 ("net: phy: fix auto-negotiation stall due to unavailable interrupt")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent cc403d5d

drivers/net/phy/phy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -598,7 +598,7 @@ static int phy_start_aneg_priv(struct phy_device *phydev, bool sync)
		* negotiation may already be done and aneg interrupt may not be
		* generated.
		*/
		if (phy_interrupt_is_valid(phydev) && (phydev->state == PHY_AN)) {
		if (phydev->irq != PHY_POLL && phydev->state == PHY_AN) {
		err = phy_aneg_done(phydev);
		if (err > 0) {
		trigger = true;