Commit 4c2687a5 authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller

ibmvnic: Ensure that TX queues are disabled in __ibmvnic_close

Use netif_tx_disable to guarantee that TX queues are disabled
when __ibmvnic_close is called by the device reset routine.
Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3e53b9a
...@@ -886,7 +886,13 @@ static int __ibmvnic_close(struct net_device *netdev) ...@@ -886,7 +886,13 @@ static int __ibmvnic_close(struct net_device *netdev)
int i; int i;
adapter->state = VNIC_CLOSING; adapter->state = VNIC_CLOSING;
netif_tx_stop_all_queues(netdev);
/* ensure that transmissions are stopped if called by do_reset */
if (adapter->resetting)
netif_tx_disable(netdev);
else
netif_tx_stop_all_queues(netdev);
ibmvnic_napi_disable(adapter); ibmvnic_napi_disable(adapter);
if (adapter->tx_scrq) { if (adapter->tx_scrq) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment