aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/014-mesh-do-not-allow-scan-result-to-swap-pri-sec.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2018-04-28 21:12:19 +0200
committerJo-Philipp Wich <jo@mein.io>2018-12-18 08:13:22 +0100
commita35f24309021c1c0e9cbed0faedf58b941cb4bd3 (patch)
tree9dcc560fbcac09a5494ffb34650fb0ee161ea4cd /package/network/services/hostapd/patches/014-mesh-do-not-allow-scan-result-to-swap-pri-sec.patch
parent5435e8023e956be4f8a21a8741fbe331db05960a (diff)
downloadupstream-a35f24309021c1c0e9cbed0faedf58b941cb4bd3.tar.gz
upstream-a35f24309021c1c0e9cbed0faedf58b941cb4bd3.tar.bz2
upstream-a35f24309021c1c0e9cbed0faedf58b941cb4bd3.zip
hostapd: update to git HEAD of 2018-05-21, allow build against wolfssl
Support for building wpa_supplicant/hostapd against wolfssl has been added upstream recently, add build option to allow users using it. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (backported from 69f544937f8498e856690f9809a016f0d7f5f68b) (rebased patches) Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network/services/hostapd/patches/014-mesh-do-not-allow-scan-result-to-swap-pri-sec.patch')
-rw-r--r--package/network/services/hostapd/patches/014-mesh-do-not-allow-scan-result-to-swap-pri-sec.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/package/network/services/hostapd/patches/014-mesh-do-not-allow-scan-result-to-swap-pri-sec.patch b/package/network/services/hostapd/patches/014-mesh-do-not-allow-scan-result-to-swap-pri-sec.patch
new file mode 100644
index 0000000000..3c692a581f
--- /dev/null
+++ b/package/network/services/hostapd/patches/014-mesh-do-not-allow-scan-result-to-swap-pri-sec.patch
@@ -0,0 +1,24 @@
+From cf2ba81fb307f3e87e13896f9dbf93c0c2a9eb92 Mon Sep 17 00:00:00 2001
+From: Peter Oh <peter.oh@bowerswilkins.com>
+Date: Tue, 17 Apr 2018 21:55:11 -0700
+Subject: [PATCH 14/16] 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
+@@ -2165,7 +2165,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);