diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2017-01-20 18:31:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-22 07:43:32 -0400 |
commit | feaa5bab43350b95428dc01cf1f064305e72dd87 (patch) | |
tree | 11079a87553a5dd6d823a8c97e5be0955127cc71 /net/ipv4/tcp_input.c | |
parent | 837786cbbb60f00770b02efd15546b36008b536e (diff) |
net: phy: Avoid deadlock during phy_error()
[ Upstream commit eab127717a6af54401ba534790c793ec143cd1fc ]
phy_error() is called in the PHY state machine workqueue context, and
calls phy_trigger_machine() which does a cancel_delayed_work_sync() of
the workqueue we execute from, causing a deadlock situation.
Augment phy_trigger_machine() machine with a sync boolean indicating
whether we should use cancel_*_sync() or just cancel_*_work().
Fixes: 3c293f4e08b5 ("net: phy: Trigger state machine on state change and not polling.")
Reported-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions