openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "iwlwifi: mvm: drop non VO frames when flushing" 

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 3b24f4c653
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 4e6c48e098.
This commit is contained in:
Emmanuel Grumbach 2015-01-20 09:25:19 +02:00
parent 84bfffa968
commit 6d440b2559
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/wireless/iwlwifi/mvm/mac80211.c
View File

@ -3565,16 +3565,18 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,
msk |= mvmsta->tfd_queue_msk; 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);
if (iwl_mvm_flush_tx_path(mvm, msk, true)) /* this can take a while, and we may need/want other operations
IWL_ERR(mvm, "flush request fail\n"); * to succeed while doing this, so do it without the mutex held
mutex_unlock(&mvm->mutex); */
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 = { const struct ieee80211_ops iwl_mvm_hw_ops = {