Commit 64ff7eb0 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: remove iwl_mvm_disable_txq() flags argument 



It's always zero, just remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220210181930.dc67b3c04d0f.I5fbc552812ab91f2c4b158eee39f63c44575db1b@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 85b17a33

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

+10 −11
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int iwl_mvm_invalidate_sta_queue(struct iwl_mvm *mvm, int queue, 
}



static int iwl_mvm_disable_txq(struct iwl_mvm *mvm, struct ieee80211_sta *sta,

			       u16 *queueptr, u8 tid, u8 flags)

			       u16 *queueptr, u8 tid)

{

	int queue = *queueptr;

	struct iwl_scd_txq_cfg_cmd cmd = {
@@ -374,7 +374,7 @@ static int iwl_mvm_disable_txq(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
	mvm->queue_info[queue].reserved = false;



	iwl_trans_txq_disable(mvm->trans, queue, false);

	ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, flags,

	ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0,

				   sizeof(struct iwl_scd_txq_cfg_cmd), &cmd);



	if (ret)
@@ -513,7 +513,7 @@ static int iwl_mvm_free_inactive_queue(struct iwl_mvm *mvm, int queue, 
		iwl_mvm_invalidate_sta_queue(mvm, queue,

					     disable_agg_tids, false);



	ret = iwl_mvm_disable_txq(mvm, old_sta, &queue_tmp, tid, 0);

	ret = iwl_mvm_disable_txq(mvm, old_sta, &queue_tmp, tid);

	if (ret) {

		IWL_ERR(mvm,

			"Failed to free inactive queue %d (ret=%d)\n",
@@ -1392,7 +1392,7 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm, 


out_err:

	queue_tmp = queue;

	iwl_mvm_disable_txq(mvm, sta, &queue_tmp, tid, 0);

	iwl_mvm_disable_txq(mvm, sta, &queue_tmp, tid);



	return ret;

}
@@ -1838,8 +1838,7 @@ static void iwl_mvm_disable_sta_queues(struct iwl_mvm *mvm, 
		if (mvm_sta->tid_data[i].txq_id == IWL_MVM_INVALID_QUEUE)

			continue;



		iwl_mvm_disable_txq(mvm, sta, &mvm_sta->tid_data[i].txq_id, i,

				    0);

		iwl_mvm_disable_txq(mvm, sta, &mvm_sta->tid_data[i].txq_id, i);

		mvm_sta->tid_data[i].txq_id = IWL_MVM_INVALID_QUEUE;

	}
@@ -2047,7 +2046,7 @@ static int iwl_mvm_add_int_sta_with_queue(struct iwl_mvm *mvm, int macidx, 
	if (ret) {

		if (!iwl_mvm_has_new_tx_api(mvm))

			iwl_mvm_disable_txq(mvm, NULL, queue,

					    IWL_MAX_TID_COUNT, 0);

					    IWL_MAX_TID_COUNT);

		return ret;

	}
@@ -2119,7 +2118,7 @@ int iwl_mvm_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	if (WARN_ON_ONCE(mvm->snif_sta.sta_id == IWL_MVM_INVALID_STA))

		return -EINVAL;



	iwl_mvm_disable_txq(mvm, NULL, &mvm->snif_queue, IWL_MAX_TID_COUNT, 0);

	iwl_mvm_disable_txq(mvm, NULL, &mvm->snif_queue, IWL_MAX_TID_COUNT);

	ret = iwl_mvm_rm_sta_common(mvm, mvm->snif_sta.sta_id);

	if (ret)

		IWL_WARN(mvm, "Failed sending remove station\n");
@@ -2136,7 +2135,7 @@ int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm) 
	if (WARN_ON_ONCE(mvm->aux_sta.sta_id == IWL_MVM_INVALID_STA))

		return -EINVAL;



	iwl_mvm_disable_txq(mvm, NULL, &mvm->aux_queue, IWL_MAX_TID_COUNT, 0);

	iwl_mvm_disable_txq(mvm, NULL, &mvm->aux_queue, IWL_MAX_TID_COUNT);

	ret = iwl_mvm_rm_sta_common(mvm, mvm->aux_sta.sta_id);

	if (ret)

		IWL_WARN(mvm, "Failed sending remove station\n");
@@ -2253,7 +2252,7 @@ static void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm, 
	}



	queue = *queueptr;

	iwl_mvm_disable_txq(mvm, NULL, queueptr, IWL_MAX_TID_COUNT, 0);

	iwl_mvm_disable_txq(mvm, NULL, queueptr, IWL_MAX_TID_COUNT);

	if (iwl_mvm_has_new_tx_api(mvm))

		return;
@@ -2488,7 +2487,7 @@ int iwl_mvm_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 


	iwl_mvm_flush_sta(mvm, &mvmvif->mcast_sta, true);



	iwl_mvm_disable_txq(mvm, NULL, &mvmvif->cab_queue, 0, 0);

	iwl_mvm_disable_txq(mvm, NULL, &mvmvif->cab_queue, 0);



	ret = iwl_mvm_rm_sta_common(mvm, mvmvif->mcast_sta.sta_id);

	if (ret)