net: phy: handle state correctly in phy_stop_machine
authorNathan Sullivan <nathan.sullivan@ni.com>
Wed, 22 Mar 2017 20:27:01 +0000 (15:27 -0500)
committerJiri Slaby <jslaby@suse.cz>
Tue, 9 May 2017 06:19:46 +0000 (08:19 +0200)
commit3253561151693de7bf23ff6269893da4835aeefb
tree0c9fe0ee22682900df380830e249dbc5f4b4a1aa
parent1337a4ffe5bcf18979e516c3d65e5b110e7edc2a
net: phy: handle state correctly in phy_stop_machine

[ 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.

Fixes: 00db8189d984 ("This patch adds a PHY Abstraction Layer to the Linux Kernel, enabling ethernet drivers to remain as ignorant as is reasonable of the connected PHY's design and operation details.")
Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Xander Huff <xander.huff@ni.com>
Acked-by: Kyle Roeschley <kyle.roeschley@ni.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phy.c