Skip to contentSkip to conversation

Patch "net: thunderbolt: Tear down connection properly on suspend" has been added to the 4.15-stable tree

PATCH [email protected] 1 participant 1 message Feb 26, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

net: thunderbolt: Tear down connection properly on suspend

to the 4.15-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-thunderbolt-tear-down-connection-properly-on-suspend.patch
and it can be found in the queue-4.15 subdirectory.

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

Quoted 1 line

From 8e021a14d908475fea89ef85b5421865f7ad650d Mon Sep 17 00:00:00 2001

From: Mika Westerberg <[email protected]>
Date: Mon, 12 Feb 2018 17:10:19 +0300
Subject: net: thunderbolt: Tear down connection properly on suspend

From: Mika Westerberg <[email protected]>

commit 8e021a14d908475fea89ef85b5421865f7ad650d upstream.

When suspending to mem or disk the Thunderbolt controller typically goes down as well tearing down the connection automatically. However, when suspend to idle is used this does not happen so we need to make sure the connection is properly disconnected before it can be re-established during resume.

Fixes e69b6c02b4c3 ("net: Add support for networking over Thunderbolt cable")
---
 drivers/net/thunderbolt.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/thunderbolt.c +1 -4
@@ -1270,10 +1270,7 @@ static int __maybe_unused tbnet_suspend(
 	stop_login(net);
 	if (netif_running(net->dev)) {
 		netif_device_detach(net->dev);
-		tb_ring_stop(net->rx_ring.ring);
-		tb_ring_stop(net->tx_ring.ring);
-		tbnet_free_buffers(&net->rx_ring);
-		tbnet_free_buffers(&net->tx_ring);
+		tbnet_tear_down(net, true);
 	}
 
 	return 0;

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

queue-4.15/net-thunderbolt-run-disconnect-flow-asynchronously-when-logout-is-received.patch queue-4.15/net-thunderbolt-tear-down-connection-properly-on-suspend.patch