iwlwifi: mvm: don't mark TIDs that are not idle wrt BA as inactive

A TID may not have traffic but still have a BA agreement
active (or being setup / torn down) since a BA agreement
can be triggered by a debugfs hook.
Just avoid to consider such a TID as inactive to make the
logic safer.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index e7cc8e05615a7c56c9f88c1b3f6b2152f0c717ed..8ba8b71dd1a41f5d76480f76b96b8e8d89c5c7e3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -1215,6 +1215,10 @@ static void iwl_mvm_remove_inactive_tids(struct iwl_mvm *mvm,
                /* If some TFDs are still queued - don't mark TID as inactive */
                if (iwl_mvm_tid_queued(mvm, &mvmsta->tid_data[tid]))
                        tid_bitmap &= ~BIT(tid);
+
+               /* Don't mark as inactive any TID that has an active BA */
+               if (mvmsta->tid_data[tid].state != IWL_AGG_OFF)
+                       tid_bitmap &= ~BIT(tid);
        }
 
        /* If all TIDs in the queue are inactive - mark queue as inactive. */