aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/003-mesh-relocate-RSN-init-function.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2018-04-28 21:12:19 +0200
committerDaniel Golle <daniel@makrotopia.org>2018-05-24 22:21:10 +0200
commit69f544937f8498e856690f9809a016f0d7f5f68b (patch)
treec960bb0f4672ca1427fc7a8a8ea2741602b543b4 /package/network/services/hostapd/patches/003-mesh-relocate-RSN-init-function.patch
parent51740777fb37cb7bdc250d74b366840269439cf3 (diff)
downloadupstream-69f544937f8498e856690f9809a016f0d7f5f68b.tar.gz
upstream-69f544937f8498e856690f9809a016f0d7f5f68b.tar.bz2
upstream-69f544937f8498e856690f9809a016f0d7f5f68b.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>
Diffstat (limited to 'package/network/services/hostapd/patches/003-mesh-relocate-RSN-init-function.patch')
-rw-r--r--package/network/services/hostapd/patches/003-mesh-relocate-RSN-init-function.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/package/network/services/hostapd/patches/003-mesh-relocate-RSN-init-function.patch b/package/network/services/hostapd/patches/003-mesh-relocate-RSN-init-function.patch
new file mode 100644
index 0000000000..95b5b16a93
--- /dev/null
+++ b/package/network/services/hostapd/patches/003-mesh-relocate-RSN-init-function.patch
@@ -0,0 +1,41 @@
+From 95425b5becaeda8a515c942f417696e5df34bbc8 Mon Sep 17 00:00:00 2001
+From: Peter Oh <peter.oh@bowerswilkins.com>
+Date: Tue, 17 Apr 2018 21:55:00 -0700
+Subject: [PATCH 03/16] mesh: relocate RSN init function
+
+RSN init function should work together with mesh join
+when it's used. Since mesh join could be called at different stage
+if DFS channel is used, relocate the function to mesh join.
+It is still the same call flows of mesh join before this changes
+if non-DFS channels are used, hence no side effect will occur.
+
+Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
+---
+ wpa_supplicant/mesh.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+--- a/wpa_supplicant/mesh.c
++++ b/wpa_supplicant/mesh.c
+@@ -335,9 +335,6 @@ static int wpa_supplicant_mesh_init(stru
+ return -1;
+ }
+
+- if (wpas_mesh_init_rsn(wpa_s))
+- goto out_free;
+-
+ wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
+
+ return 0;
+@@ -383,6 +380,12 @@ void wpas_join_mesh(struct wpa_supplican
+ struct wpa_ssid *ssid = wpa_s->current_ssid;
+ int ret = 0;
+
++ if (wpas_mesh_init_rsn(wpa_s)) {
++ wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh...");
++ wpa_supplicant_mesh_deinit(wpa_s);
++ return;
++ }
++
+ if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
+ wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher;
+ wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher;