From 7614fcebe0683a0e21e17c826634c564099e939f Mon Sep 17 00:00:00 2001 From: Vishal Miskin Date: Tue, 13 Sep 2022 18:45:53 +0530 Subject: [PATCH] ACS: Filter out 6 GHz channels if HE or EHT is not enabled Do not include 6 GHz channels in the ACS possible channel list if neither HE (ieee80211ax=1) nor EHT (ieee80211be=1) is enabled since those channels cannot be used in such combination. Signed-off-by: Vishal Miskin --- src/ap/ap_drv_ops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c index b9fd92024..721be4da1 100644 --- a/src/ap/ap_drv_ops.c +++ b/src/ap/ap_drv_ops.c @@ -905,8 +905,10 @@ static void hostapd_get_hw_mode_any_channels(struct hostapd_data *hapd, chan->chan))) continue; if (is_6ghz_freq(chan->freq) && - hapd->iface->conf->acs_exclude_6ghz_non_psc && - !is_6ghz_psc_frequency(chan->freq)) + ((hapd->iface->conf->acs_exclude_6ghz_non_psc && + !is_6ghz_psc_frequency(chan->freq)) || + (!hapd->iface->conf->ieee80211ax && + !hapd->iface->conf->ieee80211be))) continue; if (!(chan->flag & HOSTAPD_CHAN_DISABLED) && !(hapd->iface->conf->acs_exclude_dfs && -- 2.47.2