[v3,14/15] mesh: do not allow scan result to swap pri/sec

Message ID 89143d059740da63c7a9491deca5a48028580087.1524027184.git.peter.oh@bowerswilkins.com
State New
Headers show
Series
  • mesh: enable DFS channels in mesh mode
Related show

Commit Message

Peter Oh April 18, 2018, 4:55 a.m.
From: Peter Oh <peter.oh@bowerswilkins.com>

Swapping between primary and secondary channel will break
mesh from joining, hence don't allow it.

Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
---
 wpa_supplicant/wpa_supplicant.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 91af2a8..2fbb428 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2178,7 +2178,7 @@  void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
 	}
 	freq->sec_channel_offset = ht40;
 
-	if (obss_scan) {
+	if (ssid->mode != WPAS_MODE_MESH && obss_scan) {
 		struct wpa_scan_results *scan_res;
 
 		scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL, 0);