| From 8e021a14d908475fea89ef85b5421865f7ad650d Mon Sep 17 00:00:00 2001 |
| From: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Date: Mon, 12 Feb 2018 17:10:19 +0300 |
| Subject: net: thunderbolt: Tear down connection properly on suspend |
| |
| From: Mika Westerberg <mika.westerberg@linux.intel.com> |
| |
| 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") |
| Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/thunderbolt.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| --- a/drivers/net/thunderbolt.c |
| +++ b/drivers/net/thunderbolt.c |
| @@ -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; |
