Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eea76c36 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: kill iwl_mvm_enable_agg_txq 



iwl_mvm_enable_agg_txq has only one user. Kill it and
adapt the call site.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent e29cc6b9

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −16
Original line number Diff line number Diff line
@@ -1549,22 +1549,6 @@ void iwl_mvm_enable_ac_txq(struct iwl_mvm *mvm, int queue, int mac80211_queue, 
	iwl_mvm_enable_txq(mvm, queue, mac80211_queue, ssn, &cfg, wdg_timeout);

}



static inline void iwl_mvm_enable_agg_txq(struct iwl_mvm *mvm, int queue,

					  int mac80211_queue, int fifo,

					  int sta_id, int tid, int frame_limit,

					  u16 ssn, unsigned int wdg_timeout)

{

	struct iwl_trans_txq_scd_cfg cfg = {

		.fifo = fifo,

		.sta_id = sta_id,

		.tid = tid,

		.frame_limit = frame_limit,

		.aggregate = true,

	};



	iwl_mvm_enable_txq(mvm, queue, mac80211_queue, ssn, &cfg, wdg_timeout);

}



/* Thermal management and CT-kill */

void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);

void iwl_mvm_tt_temp_changed(struct iwl_mvm *mvm, u32 temp);

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

+11 −5
Original line number Diff line number Diff line
@@ -1052,9 +1052,16 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	struct iwl_mvm_tid_data *tid_data = &mvmsta->tid_data[tid];

	unsigned int wdg_timeout =

		iwl_mvm_get_wd_timeout(mvm, vif, sta->tdls, false);

	int queue, fifo, ret;

	int queue, ret;

	u16 ssn;



	struct iwl_trans_txq_scd_cfg cfg = {

		.sta_id = mvmsta->sta_id,

		.tid = tid,

		.frame_limit = buf_size,

		.aggregate = true,

	};



	BUILD_BUG_ON((sizeof(mvmsta->agg_tids) * BITS_PER_BYTE)

		     != IWL_MAX_TID_COUNT);
@@ -1069,11 +1076,10 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	tid_data->amsdu_in_ampdu_allowed = amsdu;

	spin_unlock_bh(&mvmsta->lock);



	fifo = iwl_mvm_ac_to_tx_fifo[tid_to_mac80211_ac[tid]];

	cfg.fifo = iwl_mvm_ac_to_tx_fifo[tid_to_mac80211_ac[tid]];



	iwl_mvm_enable_agg_txq(mvm, queue,

			       vif->hw_queue[tid_to_mac80211_ac[tid]], fifo,

			       mvmsta->sta_id, tid, buf_size, ssn, wdg_timeout);

	iwl_mvm_enable_txq(mvm, queue, vif->hw_queue[tid_to_mac80211_ac[tid]],

			   ssn, &cfg, wdg_timeout);



	ret = iwl_mvm_sta_tx_agg(mvm, sta, tid, queue, true);

	if (ret)