ソースを参照

qcacld-3.0: Add path to skip TPE IE in TX power calc

When calculating the TX power, add a path to not consider the TPE IE
values in case of 2G/5G bands. If device is operating in 6G band,
include the TPE IE regardless of INI configuration.

Change-Id: If829318319e9b799c75a59ce3beed39bae5bffa2
CRs-fixed: 2936487
Lincoln Tran 3 年 前
コミット
481d333d5a
1 ファイル変更3 行追加1 行削除
  1. 3 1
      core/mac/src/pe/lim/lim_process_sme_req_messages.c

+ 3 - 1
core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -4346,6 +4346,7 @@ void lim_calculate_tpc(struct mac_context *mac,
 	struct ch_params ch_params;
 	struct vdev_mlme_obj *mlme_obj;
 	uint8_t tpe_power;
+	bool skip_tpe = false;
 
 	if (!session->lim_join_req) {
 		pe_err("Join Request is NULL");
@@ -4373,6 +4374,7 @@ void lim_calculate_tpc(struct mac_context *mac,
 	if (!wlan_reg_is_6ghz_chan_freq(oper_freq)) {
 		reg_max = wlan_reg_get_channel_reg_power_for_freq(mac->pdev,
 								  oper_freq);
+		skip_tpe = wlan_mlme_skip_tpe(mac->psoc);
 	} else {
 		is_6ghz_freq = true;
 		is_psd_power = wlan_reg_is_6g_psd_power(mac->pdev);
@@ -4452,7 +4454,7 @@ void lim_calculate_tpc(struct mac_context *mac,
 				max_tx_power = reg_max - local_constraint;
 		}
 		/* If TPE is present */
-		if (is_tpe_present) {
+		if (is_tpe_present && !skip_tpe) {
 			if (!is_psd_power && mlme_obj->reg_tpc_obj.eirp_power)
 				tpe_power =  mlme_obj->reg_tpc_obj.eirp_power;
 			else