diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-06-07 11:25:30 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-07 11:25:30 +0300 |
| commit | 4c7aba46c9e82aa236502760a677e666589afead (patch) | |
| tree | 9baa94b072fa58c674c34b8ddaec8b9e727e1657 /drivers/net/vmxnet3 | |
| parent | d2dc2a96de9d58038ac1f9ee432e88a70958d59b (diff) | |
| parent | ba3021b2c79b2fa9114f92790a99deb27a65b728 (diff) | |
| download | linux-4c7aba46c9e82aa236502760a677e666589afead.tar.xz | |
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
Diffstat (limited to 'drivers/net/vmxnet3')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 25bc764ae7dc..d1c7029ded7c 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2962,6 +2962,11 @@ vmxnet3_force_close(struct vmxnet3_adapter *adapter) /* we need to enable NAPI, otherwise dev_close will deadlock */ for (i = 0; i < adapter->num_rx_queues; i++) napi_enable(&adapter->rx_queue[i].napi); + /* + * Need to clear the quiesce bit to ensure that vmxnet3_close + * can quiesce the device properly + */ + clear_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state); dev_close(adapter->netdev); } |