From: Masashi Honma <masashi.honma@gmail.com>
Date: Fri, 8 Jul 2016 02:39:13 +0000 (+0900)
Subject: mesh: Stop joining to different frequency network
X-Git-Tag: hostap_2_6~185
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=fac72f93dd83f52fd14d7787b2fc9cf4b20762dd

mesh: Stop joining to different frequency network

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
---

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index b94febb..50461b6 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1033,6 +1033,14 @@ struct wpa_ssid * wpa_scan_res_match(struct wpa_supplicant *wpa_s,
 			continue;
 		}
 
+#ifdef CONFIG_MESH
+		if (ssid->mode == IEEE80211_MODE_MESH && ssid->frequency > 0 &&
+		    ssid->frequency != bss->freq) {
+			wpa_dbg(wpa_s, MSG_DEBUG, "   skip - frequency not allowed (mesh)");
+			continue;
+		}
+#endif /* CONFIG_MESH */
+
 		if (!rate_match(wpa_s, bss)) {
 			wpa_dbg(wpa_s, MSG_DEBUG, "   skip - rate sets do "
 				"not match");