iwlwifi: mvm: hold mutex when flushing in iwl_mvm_flush_no_vif()
authorLuca Coelho <luciano.coelho@intel.com>
Tue, 24 Oct 2017 19:04:15 +0000 (22:04 +0300)
committerLuca Coelho <luciano.coelho@intel.com>
Fri, 3 Nov 2017 09:56:09 +0000 (11:56 +0200)
The iwl_mvm_flush_tx_path() function sends a synchronous command to
the firmware.  When doing that, we must hold the mutex.  The
iwl_mvm_flush_no_vif() function was mistakenly not holding the mutex.
Fix it.

Fixes: 6110d9e5bdd1 ("iwlwifi: mvm: Flush non STA TX queues")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

index ae2eb0c8cbeb36b7536f28fd8c87a601208a8e62..3e92a117c0b86b63484358043843823fcbf71efc 100644 (file)
@@ -4005,11 +4005,14 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)
        int i;
 
        if (!iwl_mvm_has_new_tx_api(mvm)) {
-               if (drop)
+               if (drop) {
+                       mutex_lock(&mvm->mutex);
                        iwl_mvm_flush_tx_path(mvm,
                                iwl_mvm_flushable_queues(mvm) & queues, 0);
-               else
+                       mutex_unlock(&mvm->mutex);
+               } else {
                        iwl_trans_wait_tx_queues_empty(mvm->trans, queues);
+               }
                return;
        }