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)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:47:08 +0000 (00:47 +0200)
commit509fda4739438283dbbb9787a4e29dd791e4690c
tree0048187bd19cafe67d600bbdef593fb6095534fa
parent9bc89352bac927c260b49b21519565fa14ed3795
net: phy: handle state correctly in phy_stop_machine

commit 49d52e8108a21749dc2114b924c907db43358984 upstream.

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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/net/phy/phy.c