Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 075ddebc authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: don't reschedule state machine when PHY is halted 



When being in state PHY_HALTED we don't have to reschedule the
state machine, phy_start() will start it again.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7979472b

drivers/net/phy/phy.c

+6 −2
Original line number Diff line number Diff line
@@ -1123,9 +1123,13 @@ void phy_state_machine(struct work_struct *work) 


	/* Only re-schedule a PHY state machine change if we are polling the

	 * PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving

	 * between states from phy_mac_interrupt()

	 * between states from phy_mac_interrupt().

	 *

	 * In state PHY_HALTED the PHY gets suspended, so rescheduling the

	 * state machine would be pointless and possibly error prone when

	 * called from phy_disconnect() synchronously.

	 */

	if (phy_polling_mode(phydev))

	if (phy_polling_mode(phydev) && old_state != PHY_HALTED)

		queue_delayed_work(system_power_efficient_wq, &phydev->state_queue,

				   PHY_STATE_TIME * HZ);

}