|
@@ -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
|