diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2018-02-12 17:10:19 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-12 12:03:04 -0500 |
| commit | 8e021a14d908475fea89ef85b5421865f7ad650d (patch) | |
| tree | d739838544db5c46b0c4c4416354cdd3cf5182d7 /drivers/net/thunderbolt.c | |
| parent | b4580c952e89a332f077038ef19a7582950c082d (diff) | |
| download | linux-stable-8e021a14d908475fea89ef85b5421865f7ad650d.tar.gz linux-stable-8e021a14d908475fea89ef85b5421865f7ad650d.tar.bz2 linux-stable-8e021a14d908475fea89ef85b5421865f7ad650d.zip | |
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>
Diffstat (limited to 'drivers/net/thunderbolt.c')
| -rw-r--r-- | drivers/net/thunderbolt.c | 5 |
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) 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; |