DFS: Consider non-contiguous channels

When looking for a new operating channel, consider the case of
non-contiguous channels when checking all the needed channels (e.g., the
driver might support channels 36, 38, 40, so look for channels 36+40
explicitly, instead of failing when encountering channel 38).

Signed-off-by: Eliad Peller <eliad@wizery.com>

diff --git a/src/ap/dfs.c b/src/ap/dfs.c
index da6fd46..18030ac 100644 (file)
--- a/src/ap/dfs.c
+++ b/src/ap/dfs.c
@@ -122,6 +122,20 @@ static int dfs_is_chan_allowed(struct hostapd_channel_data *chan, int n_chans)
 }
 
 
+static struct hostapd_channel_data *
+dfs_get_chan_data(struct hostapd_hw_modes *mode, int freq, int first_chan_idx)
+{
+       int i;
+
+       for (i = first_chan_idx; i < mode->num_channels; i++) {
+               if (mode->channels[i].freq == freq)
+                       return &mode->channels[i];
+       }
+
+       return NULL;
+}
+
+
 static int dfs_chan_range_available(struct hostapd_hw_modes *mode,
                                    int first_chan_idx, int num_chans,
                                    int skip_radar)
@@ -135,9 +149,9 @@ static int dfs_chan_range_available(struct hostapd_hw_modes *mode,
        first_chan = &mode->channels[first_chan_idx];
 
        for (i = 0; i < num_chans; i++) {
-               chan = &mode->channels[first_chan_idx + i];
-
-               if (first_chan->freq + i * 20 != chan->freq)
+               chan = dfs_get_chan_data(mode, first_chan->freq + i * 20,
+                                        first_chan_idx);
+               if (!chan)
                        return 0;
 
                if (!dfs_channel_available(chan, skip_radar))