Update Transmit Power Envelope (TPE) IE according to the reply from AFC
coordinator on UNII-5 or UNII-7 6GHz bands.
Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
---
src/ap/hostapd.c | 33 +++++++++++++++++++++++++++++++
src/ap/hostapd.h | 2 ++
src/ap/ieee802_11.c | 47 ++++++++++++++++++++++++++++-----------------
3 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 9d2de4456..946f4fce7 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -4424,3 +4424,36 @@ struct hostapd_data * hostapd_mld_get_link_bss(struct hostapd_data *hapd,
return NULL;
}
#endif /* CONFIG_IEEE80211BE */
+
+
+int hostap_afc_get_chan_max_eirp_power(struct hostapd_iface *iface, bool psd,
+ int *power)
+{
+#ifdef CONFIG_AFC
+ struct hostapd_hw_modes *mode = iface->current_mode;
+ int i;
+
+ if (!he_reg_is_sp(iface->conf->he_6ghz_reg_pwr_type))
+ return -EINVAL;
+
+ if (!mode)
+ return -EINVAL;
+
+ if (!iface->afc_completed)
+ return -EINVAL;
+
+ for (i = 0; i < mode->num_channels; i++) {
+ struct hostapd_channel_data *chan = &mode->channels[i];
+
+ if (chan->freq == iface->freq) {
+ int val;
+
+ val = psd ? chan->max_eirp_psd : chan->max_eirp_power;
+ *power = 2 * val;
+
+ return 0;
+ }
+ }
+#endif /* CONFIG_AFC */
+ return -EINVAL;
+}
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index 33b24ae5e..eb35bb66e 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -677,6 +677,8 @@ struct hostapd_iface {
};
/* hostapd.c */
+int hostap_afc_get_chan_max_eirp_power(struct hostapd_iface *iface, bool psd,
+ int *power);
int hostapd_afc_handle_request(struct hostapd_iface *iface);
int hostapd_for_each_interface(struct hapd_interfaces *interfaces,
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 7fb49a4b4..170b75676 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -7037,42 +7037,53 @@ u8 * hostapd_eid_txpower_envelope(struct hostapd_data *hapd, u8 *eid)
*/
if (is_6ghz_op_class(iconf->op_class)) {
enum max_tx_pwr_interpretation tx_pwr_intrpn;
+ int err, max_eirp_psd, max_eirp_power;
/* Same Maximum Transmit Power for all 20 MHz bands */
tx_pwr_count = 0;
tx_pwr_intrpn = REGULATORY_CLIENT_EIRP_PSD;
/* Default Transmit Power Envelope for Global Operating Class */
- if (hapd->iconf->reg_def_cli_eirp_psd != -1)
- tx_pwr = hapd->iconf->reg_def_cli_eirp_psd;
- else
- tx_pwr = REG_PSD_MAX_TXPOWER_FOR_DEFAULT_CLIENT * 2;
+ err = hostap_afc_get_chan_max_eirp_power(iface, true,
+ &max_eirp_psd);
+ if (err < 0) {
+ if (hapd->iconf->reg_def_cli_eirp_psd != -1)
+ max_eirp_psd = hapd->iconf->reg_def_cli_eirp_psd;
+ else
+ max_eirp_psd = REG_PSD_MAX_TXPOWER_FOR_DEFAULT_CLIENT * 2;
+ }
eid = hostapd_add_tpe_info(eid, tx_pwr_count, tx_pwr_intrpn,
- REG_DEFAULT_CLIENT, tx_pwr);
+ REG_DEFAULT_CLIENT, max_eirp_psd);
/* Indoor Access Point must include an additional TPE for
* subordinate devices */
if (he_reg_is_indoor(iconf->he_6ghz_reg_pwr_type)) {
- /* TODO: Extract PSD limits from channel data */
- if (hapd->iconf->reg_sub_cli_eirp_psd != -1)
- tx_pwr = hapd->iconf->reg_sub_cli_eirp_psd;
- else
- tx_pwr = REG_PSD_MAX_TXPOWER_FOR_SUBORDINATE_CLIENT * 2;
+ if (err < 0) {
+ /* non-AFC connection */
+ if (hapd->iconf->reg_sub_cli_eirp_psd != -1)
+ max_eirp_psd = hapd->iconf->reg_sub_cli_eirp_psd;
+ else
+ max_eirp_psd = REG_PSD_MAX_TXPOWER_FOR_SUBORDINATE_CLIENT * 2;
+ }
eid = hostapd_add_tpe_info(eid, tx_pwr_count,
tx_pwr_intrpn,
REG_SUBORDINATE_CLIENT,
- tx_pwr);
+ max_eirp_psd);
}
- if (iconf->reg_def_cli_eirp != -1 &&
- he_reg_is_sp(iconf->he_6ghz_reg_pwr_type))
- eid = hostapd_add_tpe_info(
- eid, tx_pwr_count, REGULATORY_CLIENT_EIRP,
- REG_DEFAULT_CLIENT,
- hapd->iconf->reg_def_cli_eirp);
+ if (hostap_afc_get_chan_max_eirp_power(iface, false,
+ &max_eirp_power)) {
+ max_eirp_power = iconf->reg_def_cli_eirp;
+ if (max_eirp_power == -1 ||
+ !he_reg_is_sp(iconf->he_6ghz_reg_pwr_type))
+ return eid;
+ }
- return eid;
+ return hostapd_add_tpe_info(eid, tx_pwr_count,
+ REGULATORY_CLIENT_EIRP,
+ REG_DEFAULT_CLIENT,
+ max_eirp_power);
}
#endif /* CONFIG_IEEE80211AX */
--
2.43.0
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
