|
@@ -886,7 +886,13 @@ static int __ibmvnic_close(struct net_device *netdev)
|
|
|
int i;
|
|
|
|
|
|
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);
|
|
|
|
|
|
if (adapter->tx_scrq) {
|