Merge "qcacld-3.0: Add fixes related to 6ghz vlp feature" into wlan-cld3.driver.lnx.2.0

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -4221,12 +4221,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++) {

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,
 							&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);