diff options
| author | Heiner Kallweit <[email protected]> | 2018-07-19 06:15:16 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-07-21 23:20:38 +0000 |
| commit | 215d08a85b9acf5e1fe9dbf50f1774cde333efef (patch) | |
| tree | 134b54ef6258dde6510230c971c941db9457db45 /drivers/net/phy/phy.c | |
| parent | Merge branch 'qed-Fix-series-II' (diff) | |
| download | kernel-215d08a85b9acf5e1fe9dbf50f1774cde333efef.tar.gz kernel-215d08a85b9acf5e1fe9dbf50f1774cde333efef.zip | |
net: phy: consider PHY_IGNORE_INTERRUPT in phy_start_aneg_priv
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 <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 537297d2b4b4..6c9b24fe3148 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,7 +514,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; |