ACS: Extend acs_surveys_are_sufficient() for all modes

This is preparation for being able to support hw_mode=any to select the
best channel from any supported mode.

Signed-off-by: Neo Jou <neojou@gmail.com>

diff --git a/src/ap/acs.c b/src/ap/acs.c
index ab3f17ea2046d049573c0244ee0519efb86ec3b3..8b6686e855beebfb623b37c266f5a534a56a9ab9 100644 (file)
--- a/src/ap/acs.c
+++ b/src/ap/acs.c
@@ -462,21 +462,35 @@ static int acs_survey_list_is_sufficient(struct hostapd_channel_data *chan)
 }
 
 
-static int acs_surveys_are_sufficient(struct hostapd_iface *iface)
+static int acs_surveys_are_sufficient_mode(struct hostapd_hw_modes *mode)
 {
        int i;
        struct hostapd_channel_data *chan;
-       int valid = 0;
 
-       for (i = 0; i < iface->current_mode->num_channels; i++) {
-               chan = &iface->current_mode->channels[i];
+       for (i = 0; i < mode->num_channels; i++) {
+               chan = &mode->channels[i];
                if (!(chan->flag & HOSTAPD_CHAN_DISABLED) &&
                    acs_survey_list_is_sufficient(chan))
-                       valid++;
+                       return 1;
+       }
+
+       return 0;
+}
+
+
+static int acs_surveys_are_sufficient(struct hostapd_iface *iface)
+{
+       int i;
+       struct hostapd_hw_modes *mode;
+
+       for (i = 0; i < iface->num_hw_features; i++) {
+               mode = &iface->hw_features[i];
+               if (!hostapd_hw_skip_mode(iface, mode) &&
+                   acs_surveys_are_sufficient_mode(mode))
+                       return 1;
        }
 
-       /* We need at least survey data for one channel */
-       return !!valid;
+       return 0;
 }