hostapd: DFS allow mixed channels

Allow mixed DFS and non-DFS channels, e.g., VHT160 on channels 36-64.
This is useful for testing VHT160 with mac80211_hwsim.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>

diff --git a/src/ap/dfs.c b/src/ap/dfs.c
index 47e5002a1ab759abbb1f6fec2e617f4981b65c31..6476b5335c7656093e2b5ac2aa87d389af178a4f 100644 (file)
--- a/src/ap/dfs.c
+++ b/src/ap/dfs.c
@@ -296,6 +296,13 @@ static int dfs_check_chans_available(struct hostapd_iface *iface,
 
        for(i = 0; i < n_chans; i++) {
                channel = &mode->channels[start_chan_idx + i];
+
+               if (channel->flag & HOSTAPD_CHAN_DISABLED)
+                       break;
+
+               if (!(channel->flag & HOSTAPD_CHAN_RADAR))
+                       continue;
+
                if ((channel->flag & HOSTAPD_CHAN_DFS_MASK) !=
                    HOSTAPD_CHAN_DFS_AVAILABLE)
                        break;