diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2018-09-28 12:21:17 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-15 12:53:00 +0300 |
| commit | 18d4decc62babc630a98ee05f1362dcde4875c12 (patch) | |
| tree | f84a41aa021ec4fd20fcee050317ea9bdb7d410e | |
| parent | e86a0475c5207eb24bee62b9377e4457323ecd37 (diff) | |
| download | linux-18d4decc62babc630a98ee05f1362dcde4875c12.tar.xz | |
net: thunderbolt: Unregister ThunderboltIP protocol handler when suspending
[ Upstream commit 9872760eb7b1d4f6066ad8b560714a5d0a728fdb ]
The XDomain protocol messages may start as soon as Thunderbolt control
channel is started. This means that if the other host starts sending
ThunderboltIP packets early enough they will be passed to the network
driver which then gets confused because its resume hook is not called
yet.
Fix this by unregistering the ThunderboltIP protocol handler when
suspending and registering it back on resume.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/thunderbolt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c index c48c3a1eb1f8..fcf31335a8b6 100644 --- a/drivers/net/thunderbolt.c +++ b/drivers/net/thunderbolt.c @@ -1282,6 +1282,7 @@ static int __maybe_unused tbnet_suspend(struct device *dev) tbnet_tear_down(net, true); } + tb_unregister_protocol_handler(&net->handler); return 0; } @@ -1290,6 +1291,8 @@ static int __maybe_unused tbnet_resume(struct device *dev) struct tb_service *svc = tb_to_service(dev); struct tbnet *net = tb_service_get_drvdata(svc); + tb_register_protocol_handler(&net->handler); + netif_carrier_off(net->dev); if (netif_running(net->dev)) { netif_device_attach(net->dev); |