|
@@ -4002,6 +4002,8 @@ out_unlock:
|
|
|
|
|
|
static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)
|
|
static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)
|
|
{
|
|
{
|
|
|
|
+ int i;
|
|
|
|
+
|
|
if (drop) {
|
|
if (drop) {
|
|
if (iwl_mvm_has_new_tx_api(mvm))
|
|
if (iwl_mvm_has_new_tx_api(mvm))
|
|
/* TODO new tx api */
|
|
/* TODO new tx api */
|
|
@@ -4009,32 +4011,28 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)
|
|
"Need to implement flush TX queue\n");
|
|
"Need to implement flush TX queue\n");
|
|
else
|
|
else
|
|
iwl_mvm_flush_tx_path(mvm,
|
|
iwl_mvm_flush_tx_path(mvm,
|
|
- iwl_mvm_flushable_queues(mvm) & queues,
|
|
|
|
- 0);
|
|
|
|
- } else {
|
|
|
|
- if (iwl_mvm_has_new_tx_api(mvm)) {
|
|
|
|
- struct ieee80211_sta *sta;
|
|
|
|
- int i;
|
|
|
|
|
|
+ iwl_mvm_flushable_queues(mvm) & queues, 0);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
- mutex_lock(&mvm->mutex);
|
|
|
|
|
|
+ if (!iwl_mvm_has_new_tx_api(mvm)) {
|
|
|
|
+ iwl_trans_wait_tx_queues_empty(mvm->trans, queues);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
- for (i = 0; i < ARRAY_SIZE(mvm->fw_id_to_mac_id); i++) {
|
|
|
|
- sta = rcu_dereference_protected(
|
|
|
|
- mvm->fw_id_to_mac_id[i],
|
|
|
|
- lockdep_is_held(&mvm->mutex));
|
|
|
|
- if (IS_ERR_OR_NULL(sta))
|
|
|
|
- continue;
|
|
|
|
|
|
+ mutex_lock(&mvm->mutex);
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(mvm->fw_id_to_mac_id); i++) {
|
|
|
|
+ struct ieee80211_sta *sta;
|
|
|
|
|
|
- iwl_mvm_wait_sta_queues_empty(mvm,
|
|
|
|
- iwl_mvm_sta_from_mac80211(sta));
|
|
|
|
- }
|
|
|
|
|
|
+ sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[i],
|
|
|
|
+ lockdep_is_held(&mvm->mutex));
|
|
|
|
+ if (IS_ERR_OR_NULL(sta))
|
|
|
|
+ continue;
|
|
|
|
|
|
- mutex_unlock(&mvm->mutex);
|
|
|
|
- } else {
|
|
|
|
- iwl_trans_wait_tx_queues_empty(mvm->trans,
|
|
|
|
- queues);
|
|
|
|
- }
|
|
|
|
|
|
+ iwl_mvm_wait_sta_queues_empty(mvm,
|
|
|
|
+ iwl_mvm_sta_from_mac80211(sta));
|
|
}
|
|
}
|
|
|
|
+ mutex_unlock(&mvm->mutex);
|
|
}
|
|
}
|
|
|
|
|
|
static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,
|
|
static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,
|