Commit c96469f8 authored Nov 07, 2018 by Heiner Kallweit Committed by David S. Miller Nov 08, 2018

net: phy: remove useless check in state machine case PHY_RESUMING

If aneg isn't finished yet then the PHY reports the link as down.
There's no benefit in setting the state to PHY_AN because the next
state machine run would set the status to PHY_NOLINK anyway (except
in the meantime aneg has been finished and link is up). Therefore
we can set the state to PHY_RUNNING or PHY_NOLINK directly.

In addition change the do_carrier parameter in phy_link_down() to true.
If carrier was marked as up before (what should never be the case because
PHY was in state PHY_HALTED before) then we should mark it as down now.

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

parent 3b01ea72

drivers/net/phy/phy.c

+1 −12

Original line number	Diff line number	Diff line
		@@ -1022,17 +1022,6 @@ void phy_state_machine(struct work_struct *work)
		}
		break;
		case PHY_RESUMING:
		if (AUTONEG_ENABLE == phydev->autoneg) {
		err = phy_aneg_done(phydev);
		if (err < 0) {
		break;
		} else if (!err) {
		phydev->state = PHY_AN;
		phydev->link_timeout = PHY_AN_TIMEOUT;
		break;
		}
		}

		err = phy_read_status(phydev);
		if (err)
		break;
		@@ -1042,7 +1031,7 @@ void phy_state_machine(struct work_struct *work)
		phy_link_up(phydev);
		} else {
		phydev->state = PHY_NOLINK;
		phy_link_down(phydev, false);
		phy_link_down(phydev, true);
		}
		break;
		}

Admin message