Patch "net: phy: handle state correctly in phy_stop_machine" has been added to the 4.10-stable tree

This is a note to let you know that I've just added the patch titled

net: phy: handle state correctly in phy_stop_machine

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-phy-handle-state-correctly-in-phy_stop_machine.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Nathan Sullivan <[email protected]>
Date: Wed, 22 Mar 2017 15:27:01 -0500
Subject: net: phy: handle state correctly in phy_stop_machine

From: Nathan Sullivan <[email protected]>

[ Upstream commit 49d52e8108a21749dc2114b924c907db43358984 ]

If the PHY is halted on stop, then do not set the state to PHY_UP. This ensures the phy will be restarted later in phy_start when the machine is started again.

---
 drivers/net/phy/phy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -678,7 +678,7 @@ void phy_stop_machine(struct phy_device
 	cancel_delayed_work_sync(&phydev->state_queue);
 
 	mutex_lock(&phydev->lock);
-	if (phydev->state > PHY_UP)
+	if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
 		phydev->state = PHY_UP;
 	mutex_unlock(&phydev->lock);
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/net-phy-handle-state-correctly-in-phy_stop_machine.patch