iwlwifi: mvm: convert to FW AC when configuring MU EDCA (5cc74f65) · Commits · 戴 / test

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

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2365,22 +2365,23 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,

	/* Mark MU EDCA as enabled, unless none detected on some AC */		/* Mark MU EDCA as enabled, unless none detected on some AC */
	flags \|= STA_CTXT_HE_MU_EDCA_CW;		flags \|= STA_CTXT_HE_MU_EDCA_CW;
	for (i = 0; i < AC_NUM; i++) {		for (i = 0; i < IEEE80211_NUM_ACS; i++) {
	struct ieee80211_he_mu_edca_param_ac_rec *mu_edca =		struct ieee80211_he_mu_edca_param_ac_rec *mu_edca =
	&mvmvif->queue_params[i].mu_edca_param_rec;		&mvmvif->queue_params[i].mu_edca_param_rec;
			u8 ac = iwl_mvm_mac80211_ac_to_ucode_ac(i);

	if (!mvmvif->queue_params[i].mu_edca) {		if (!mvmvif->queue_params[i].mu_edca) {
	flags &= ~STA_CTXT_HE_MU_EDCA_CW;		flags &= ~STA_CTXT_HE_MU_EDCA_CW;
	break;		break;
	}		}

	sta_ctxt_cmd.trig_based_txf[i].cwmin =		sta_ctxt_cmd.trig_based_txf[ac].cwmin =
	cpu_to_le16(mu_edca->ecw_min_max & 0xf);		cpu_to_le16(mu_edca->ecw_min_max & 0xf);
	sta_ctxt_cmd.trig_based_txf[i].cwmax =		sta_ctxt_cmd.trig_based_txf[ac].cwmax =
	cpu_to_le16((mu_edca->ecw_min_max & 0xf0) >> 4);		cpu_to_le16((mu_edca->ecw_min_max & 0xf0) >> 4);
	sta_ctxt_cmd.trig_based_txf[i].aifsn =		sta_ctxt_cmd.trig_based_txf[ac].aifsn =
	cpu_to_le16(mu_edca->aifsn);		cpu_to_le16(mu_edca->aifsn);
	sta_ctxt_cmd.trig_based_txf[i].mu_time =		sta_ctxt_cmd.trig_based_txf[ac].mu_time =
	cpu_to_le16(mu_edca->mu_edca_timer);		cpu_to_le16(mu_edca->mu_edca_timer);
	}		}