github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 19:43:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: iwlwifi: mld: refactor AP power type setting

Browse Source 
Fix unsafe power type mapping for iwl_txpower_constraints_cmd
that breaks if enum values change. Replace "power_type - 1" with
explicit case handling for each power type.
While on it, Add debug logging to show configured power type.

Signed-off-by: Pagadala Yesu Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20251110150012.f3b15566dac8.I31b900ab161fb627158dc1b3e2fc4ab35d84fddf@changeid
This commit is contained in:
Pagadala Yesu Anjaneyulu 2025-11-10 15:02:20 +02:00 committed by Miri Korenblit
parent 58192b9ce0
commit cc10aa8124
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/wireless/intel/iwlwifi/mld/power.c
View File

@ -328,6 +328,33 @@ iwl_mld_tpe_sta_cmd_data(struct iwl_txpower_constraints_cmd *cmd,
link->tpe.max_reg_client[0].power[i]);
}
static int
iwl_mld_set_ap_power_type(struct iwl_txpower_constraints_cmd *cmd,
struct ieee80211_vif *vif,
struct ieee80211_bss_conf *link)
{
if (vif->type == NL80211_IFTYPE_AP) {
cmd->ap_type = cpu_to_le16(IWL_6GHZ_AP_TYPE_VLP);
return 0;
}
switch (link->power_type) {
case IEEE80211_REG_LPI_AP:
cmd->ap_type = cpu_to_le16(IWL_6GHZ_AP_TYPE_LPI);
break;
case IEEE80211_REG_SP_AP:
cmd->ap_type = cpu_to_le16(IWL_6GHZ_AP_TYPE_SP);
break;
case IEEE80211_REG_VLP_AP:
cmd->ap_type = cpu_to_le16(IWL_6GHZ_AP_TYPE_VLP);
break;
default:
return -EINVAL;
}
return 0;
}
void
iwl_mld_send_ap_tx_power_constraint_cmd(struct iwl_mld *mld,
struct ieee80211_vif *vif,
@ -349,15 +376,13 @@ iwl_mld_send_ap_tx_power_constraint_cmd(struct iwl_mld *mld,
memset(cmd.psd_pwr, DEFAULT_TPE_TX_POWER, sizeof(cmd.psd_pwr));
memset(cmd.eirp_pwr, DEFAULT_TPE_TX_POWER, sizeof(cmd.eirp_pwr));
if (vif->type == NL80211_IFTYPE_AP) {
cmd.ap_type = cpu_to_le16(IWL_6GHZ_AP_TYPE_VLP);
} else if (link->power_type == IEEE80211_REG_UNSET_AP) {
if (iwl_mld_set_ap_power_type(&cmd, vif, link))
return;
} else {
cmd.ap_type = cpu_to_le16(link->power_type - 1);
iwl_mld_tpe_sta_cmd_data(&cmd, link);
}
if (vif->type != NL80211_IFTYPE_AP)
iwl_mld_tpe_sta_cmd_data(&cmd, link);
IWL_DEBUG_POWER(mld, "AP power type: %d\n", le16_to_cpu(cmd.ap_type));
ret = iwl_mld_send_cmd_pdu(mld,
WIDE_ID(PHY_OPS_GROUP,
AP_TX_POWER_CONSTRAINTS_CMD),