diff options
| author | Thomas Falcon <tlfalcon@linux.vnet.ibm.com> | 2017-06-15 06:50:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-15 20:29:00 +0200 |
| commit | 4c2687a512b9a6737e86d72f23ad0a1097d56bd5 (patch) | |
| tree | b52b29ecbdd50c3bd5b524c7fa055d96a4915b8d /drivers/net/ethernet/ibm | |
| parent | ibmvnic: Activate disabled RX buffer pools on reset (diff) | |
| download | linux-4c2687a512b9a6737e86d72f23ad0a1097d56bd5.tar.xz linux-4c2687a512b9a6737e86d72f23ad0a1097d56bd5.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/ibm')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 99c552a79e9d..134ab295c1d6 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/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) { |