Revert "iwlwifi: mvm: drop non VO frames when flushing" (6d440b25) · Commits · 戴 / test

This is now implemented by mac80211 (commit below). mac80211 will flush/drop the frames on the queues before suspending / disconnecting. It will then send the deauth and wait until the queues are empty. commit Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Date: Wed Jan 7 15:42:39 2015 +0200 mac80211: let flush() drop packets when possible This reverts commit .

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

+11 −9

Original line number	Diff line number	Diff line
		@@ -3565,17 +3565,19 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,
		msk \|= mvmsta->tfd_queue_msk;
		}

		msk &= ~BIT(vif->hw_queue[IEEE80211_AC_VO]);

		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);
		}
		}

		const struct ieee80211_ops iwl_mvm_hw_ops = {
		.tx = iwl_mvm_mac_tx,

Admin message