d88934aa5a
And import patchset to allow 802.11s mesh on DFS channels, see also http://lists.infradead.org/pipermail/hostap/2018-April/038418.html Fix sae_password for encryption mesh (sent upstream as well). Also refreshed existing patches and fixed 463-add-mcast_rate-to-11s. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
24 lines
822 B
Diff
24 lines
822 B
Diff
From fcc5fe675d1155d65df0471aa06f746c28b66b6c Mon Sep 17 00:00:00 2001
|
|
From: Peter Oh <peter.oh@bowerswilkins.com>
|
|
Date: Thu, 12 Apr 2018 02:49:11 -0700
|
|
Subject: [PATCH 14/15] mesh: do not allow scan result to swap pri/sec
|
|
|
|
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(-)
|
|
|
|
--- a/wpa_supplicant/wpa_supplicant.c
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
|
@@ -2158,7 +2158,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
|
}
|
|
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);
|