Commit 4b387906 authored by Avraham Stern's avatar Avraham Stern Committed by Luca Coelho
Browse files

iwlwifi: mvm: clear tx queue id when unreserving aggregation queue 



When a queue is reserved for aggregation, the queue id is assigned
to the tid_data. This is fine since iwl_mvm_sta_tx_agg_oper()
takes care of allocating the queue before actual tx starts.
When the reservation is cancelled (e.g. when the AP declined the
aggregation request) the tid_data is not cleared. As a result,
following tx for this tid was trying to use an unallocated queue.

Fix this by setting the txq_id for the tid to invalid when unreserving
the queue.

Signed-off-by: default avatarAvraham Stern <avraham.stern@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 19125cb0

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+8 −4
Original line number Diff line number Diff line
@@ -2696,8 +2696,10 @@ out: 


static void iwl_mvm_unreserve_agg_queue(struct iwl_mvm *mvm,

					struct iwl_mvm_sta *mvmsta,

					u16 txq_id)

					struct iwl_mvm_tid_data *tid_data)

{

	u16 txq_id = tid_data->txq_id;



	if (iwl_mvm_has_new_tx_api(mvm))

		return;
@@ -2709,8 +2711,10 @@ static void iwl_mvm_unreserve_agg_queue(struct iwl_mvm *mvm, 
	 * allocated through iwl_mvm_enable_txq, so we can just mark it back as

	 * free.

	 */

	if (mvm->queue_info[txq_id].status == IWL_MVM_QUEUE_RESERVED)

	if (mvm->queue_info[txq_id].status == IWL_MVM_QUEUE_RESERVED) {

		mvm->queue_info[txq_id].status = IWL_MVM_QUEUE_FREE;

		tid_data->txq_id = IWL_MVM_INVALID_QUEUE;

	}



	spin_unlock_bh(&mvm->queue_info_lock);

}
@@ -2741,7 +2745,7 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 


	mvmsta->agg_tids &= ~BIT(tid);



	iwl_mvm_unreserve_agg_queue(mvm, mvmsta, txq_id);

	iwl_mvm_unreserve_agg_queue(mvm, mvmsta, tid_data);



	switch (tid_data->state) {

	case IWL_AGG_ON:
@@ -2808,7 +2812,7 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	mvmsta->agg_tids &= ~BIT(tid);

	spin_unlock_bh(&mvmsta->lock);



	iwl_mvm_unreserve_agg_queue(mvm, mvmsta, txq_id);

	iwl_mvm_unreserve_agg_queue(mvm, mvmsta, tid_data);



	if (old_state >= IWL_AGG_ON) {

		iwl_mvm_drain_sta(mvm, mvmsta, true);

CRA Git | Maintained and supported by SUSTech CRA and CCSE