qcacld-3.0: Add fixes related to 6ghz vlp feature

Fix the PSD start freq calculation for sap case.
Also, remove duplication of 6ghz freq checks in
tpc power calculation api.

Change-Id: I5f1773b551ff7b893514b5c7720c6684fc100077
CRs-fixed: 2879460
This commit is contained in:
Lincoln Tran 2021-02-11 22:02:10 -08:00 • committed by snandini
commit f493ef7ef4
2 changed files with 3 additions and 9 deletions

View file

@ -1995,12 +1995,6 @@ void lim_calculate_tpc(struct mac_context *mac,
session->ch_width);
}
if (!wlan_reg_is_6ghz_chan_freq(oper_freq))
reg_max = wlan_reg_get_channel_reg_power_for_freq(mac->pdev,
oper_freq);
else
is_6ghz_freq = true;
ch_params.ch_width = CH_WIDTH_20MHZ;
for (i = 0; i < num_pwr_levels; i++) {

View file

@ -427,14 +427,14 @@ populate_dot11f_tx_power_env(struct mac_context *mac,
chan_freq,
&chan_params);
psd_start_freq = chan_params.mhz_freq_seg0 - bw_val + 10;
psd_start_freq = chan_params.mhz_freq_seg0 - bw_val / 2 + 10;
for (count = 0; count < num_tx_power_psd; count++) {
wlan_reg_get_client_power_for_6ghz_ap(
mac->pdev,
REG_DEFAULT_CLIENT,
psd_start_freq +
20 * num_tx_power_psd,
20 * count,
&psd_tpe,
&reg_power,
&eirp_power);
@ -469,7 +469,7 @@ populate_dot11f_tx_power_env(struct mac_context *mac,
mac->pdev,
REG_SUBORDINATE_CLIENT,
psd_start_freq +
20 * num_tx_power_psd,
20 * count,
&psd_tpe,
&reg_power,
&eirp_power);