1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 2c79ad360cd9..cef6f3373542 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -3565,16 +3565,18 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,
                 msk |= mvmsta->tfd_queue_msk;
         }
 
-        msk &= ~BIT(vif->hw_queue[IEEE80211_AC_VO]);
-
-        if (iwl_mvm_flush_tx_path(mvm, msk, true))
-                IWL_ERR(mvm, "flush request fail\n");
-        mutex_unlock(&mvm->mutex);
+        if (drop) {
+                if (iwl_mvm_flush_tx_path(mvm, msk, true))
+                        IWL_ERR(mvm, "flush request fail\n");
+                mutex_unlock(&mvm->mutex);
+        } else {
+                mutex_unlock(&mvm->mutex);
 
-        /* this can take a while, and we may need/want other operations
-         * to succeed while doing this, so do it without the mutex held
-         */
-        iwl_trans_wait_tx_queue_empty(mvm->trans, msk);
+                /* this can take a while, and we may need/want other operations
+                 * to succeed while doing this, so do it without the mutex held
+                 */
+                iwl_trans_wait_tx_queue_empty(mvm->trans, msk);
+        }
 }
 
 const struct ieee80211_ops iwl_mvm_hw_ops = {