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 <quic_vmiskin@quicinc.com>

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index b9fd920243a8b220db969722fd754efb89923584..721be4da15e1f36d791d9706f4c77c4ffc314217 100644 (file)
--- 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 &&