DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

ACS: Add link id if operating as an AP MLD

Browse source 
ACS is triggered per link, so link id is needed for the driver to handle
when the ACS operation is offloaded.

Signed-off-by: Chenming Huang <quic_chenhuan@quicinc.com>
This commit is contained in:
Chenming Huang 2023-07-29 07:49:03 +05:30 committed by Jouni Malinen
parent 1abdeaa412
commit 0e91a86ec5
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ap/ap_drv_ops.c
View file

@ -1095,6 +1095,12 @@ int hostapd_drv_do_acs(struct hostapd_data *hapd)
os_memset(&params, 0, sizeof(params)); os_memset(&params, 0, sizeof(params));
params.hw_mode = hapd->iface->conf->hw_mode; params.hw_mode = hapd->iface->conf->hw_mode;
params.link_id = -1;
#ifdef CONFIG_IEEE80211BE
if (hapd->conf->mld_ap && hapd->iconf->ieee80211be &&
!hapd->conf->disable_11be)
params.link_id = hapd->mld_link_id;
#endif /* CONFIG_IEEE80211BE */
/* /*
* If no chanlist config parameter is provided, include all enabled * If no chanlist config parameter is provided, include all enabled

3
src/drivers/driver.h
View file

@ -2816,6 +2816,9 @@ struct drv_acs_params {
/* Indicates whether EHT is enabled */ /* Indicates whether EHT is enabled */
bool eht_enabled; bool eht_enabled;
/* Indicates the link if MLO case; -1 otherwise */
int link_id;
}; };
struct wpa_bss_trans_info { struct wpa_bss_trans_info {

9
src/drivers/driver_nl80211.c
View file

@ -12511,17 +12511,20 @@ static int nl80211_qca_do_acs(struct wpa_driver_nl80211_data *drv,
add_acs_ch_list(msg, params->freq_list) || add_acs_ch_list(msg, params->freq_list) ||
add_acs_freq_list(msg, params->freq_list) || add_acs_freq_list(msg, params->freq_list) ||
(params->edmg_enabled && (params->edmg_enabled &&
nla_put_flag(msg, QCA_WLAN_VENDOR_ATTR_ACS_EDMG_ENABLED))) { nla_put_flag(msg, QCA_WLAN_VENDOR_ATTR_ACS_EDMG_ENABLED)) ||
(params->link_id != NL80211_DRV_LINK_ID_NA &&
nla_put_u8(msg, QCA_WLAN_VENDOR_ATTR_ACS_LINK_ID,
params->link_id))) {
nlmsg_free(msg); nlmsg_free(msg);
return -ENOBUFS; return -ENOBUFS;
} }
nla_nest_end(msg, data); nla_nest_end(msg, data);
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: ACS Params: HW_MODE: %d HT: %d HT40: %d VHT: %d EHT: %d BW: %d EDMG: %d", "nl80211: ACS Params: HW_MODE: %d HT: %d HT40: %d VHT: %d EHT: %d BW: %d EDMG: %d, link_id: %d",
params->hw_mode, params->ht_enabled, params->ht40_enabled, params->hw_mode, params->ht_enabled, params->ht40_enabled,
params->vht_enabled, params->eht_enabled, params->ch_width, params->vht_enabled, params->eht_enabled, params->ch_width,
params->edmg_enabled); params->edmg_enabled, params->link_id);
ret = send_and_recv_cmd(drv, msg); ret = send_and_recv_cmd(drv, msg);
if (ret) { if (ret) {