浏览代码

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: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Thomas Falcon 8 年之前
父节点
当前提交
4c2687a512
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      drivers/net/ethernet/ibm/ibmvnic.c

+ 7 - 1
drivers/net/ethernet/ibm/ibmvnic.c

@@ -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) {