From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Date: Sat, 15 Feb 2014 18:37:21 +0000 (+0100)
Subject: hostapd: DFS allow mixed channels
X-Git-Tag: hostap_2_2~800
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8058a69b083e809338fcb4de75f139987ff06ed;p=thirdparty%2Fhostap.git

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 47e5002a1..6476b5335 100644
--- 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;