Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 480acbce authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: flush queues without mutex held 



For WMM-AC we may have to be changing QoS parameters while the
queues are being flushed. This is not relevant in the "drop"
case, but matters when we wait for the device to finish the
transmissions.

To allow this, do the actual waiting without holding the mutex.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent f85e9d19

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+12 −6
Original line number Diff line number Diff line
@@ -2997,18 +2997,24 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw, 
	mvmvif = iwl_mvm_vif_from_mac80211(vif);

	mvmsta = iwl_mvm_sta_from_staid_protected(mvm, mvmvif->ap_sta_id);



	if (WARN_ON_ONCE(!mvmsta))

		goto done;

	if (WARN_ON_ONCE(!mvmsta)) {

		mutex_unlock(&mvm->mutex);

		return;

	}



	if (drop) {

		if (iwl_mvm_flush_tx_path(mvm, mvmsta->tfd_queue_msk, true))

			IWL_ERR(mvm, "flush request fail\n");

		mutex_unlock(&mvm->mutex);

	} else {

		iwl_trans_wait_tx_queue_empty(mvm->trans,

					      mvmsta->tfd_queue_msk);

	}

done:

		u32 tfd_queue_msk = mvmsta->tfd_queue_msk;

		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, tfd_queue_msk);

	}

}



const struct ieee80211_ops iwl_mvm_hw_ops = {