ACS: Extend support to exclude 6 GHz non-PSC in non-offloaded ACS

Currently, support to exclude non-PSC 6 GHz channels is implemented
only for offloaded ACS. Extend the support to non-offloaded ACS using
the acs_exclude_6ghz_non_psc configuration option.

Signed-off-by: Suraj P Kizhakkethil <suraj.kizhakkethil@oss.qualcomm.com>

diff --git a/src/ap/acs.c b/src/ap/acs.c
index 5a1e58207b9b0b4285ecbdeda9fa803e591d943e..22dcd87bf6ef0d83d5c04719b885f8d92c46ac04 100644 (file)
--- a/src/ap/acs.c
+++ b/src/ap/acs.c
@@ -936,6 +936,10 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
                        if (!is_in_freqlist(iface, chan2))
                                continue;
 
+                       if (iface->conf->acs_exclude_6ghz_non_psc &&
+                           !is_6ghz_psc_frequency(chan2->freq))
+                               continue;
+
                        /* find the best channel in this segment */
                        if (!best || chan2->interference_factor <
                            best->interference_factor)