summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2018-02-12 09:10:19 -0500
committerDavid S. Miller <davem@davemloft.net>2018-02-12 12:03:04 -0500
commit8e021a14d908475fea89ef85b5421865f7ad650d (patch)
treed739838544db5c46b0c4c4416354cdd3cf5182d7
parentb4580c952e89a332f077038ef19a7582950c082d (diff)
net: thunderbolt: Tear down connection properly on suspend
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") Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: stable@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/thunderbolt.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c
index ca5e375de27c..71cf9ab72fbc 100644
--- a/drivers/net/thunderbolt.c
+++ b/drivers/net/thunderbolt.c
@@ -1270,10 +1270,7 @@ static int __maybe_unused tbnet_suspend(struct device *dev)
1270 stop_login(net); 1270 stop_login(net);
1271 if (netif_running(net->dev)) { 1271 if (netif_running(net->dev)) {
1272 netif_device_detach(net->dev); 1272 netif_device_detach(net->dev);
1273 tb_ring_stop(net->rx_ring.ring); 1273 tbnet_tear_down(net, true);
1274 tb_ring_stop(net->tx_ring.ring);
1275 tbnet_free_buffers(&net->rx_ring);
1276 tbnet_free_buffers(&net->tx_ring);
1277 } 1274 }
1278 1275
1279 return 0; 1276 return 0;