From f493ef7ef490b41bb13dd3d31e6092a2cd8de9e0 Mon Sep 17 00:00:00 2001 From: Lincoln Tran Date: Thu, 11 Feb 2021 22:02:10 -0800 Subject: [PATCH] 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 --- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 6 ------ core/mac/src/sys/legacy/src/utils/src/parser_api.c | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index c8888e5b6b41..a7b7af005bc7 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -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++) { diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index f9de5f0d5007..ffe0bd42d70c 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -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, ®_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, ®_power, &eirp_power);