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-05-31 00:10:49 +0200
committerDaniel Golle <daniel@makrotopia.org>2018-05-31 00:38:16 +0200
commit78f1974bc565d7544589a49ad8efd92c4ddec5b3 (patch)
tree2ba738d93778958d880ed37896c2bb617f19b9e1 /package/network/services/hostapd/patches/003-mesh-relocate-RSN-init-function.patch
parentdad39249fb91d6f320256ac12944863f09bb2dc9 (diff)
downloadupstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.gz
upstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.bz2
upstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.zip
hostapd: update packaging and patches
Clean up conflicts/provides/depends hell and add PROVIDES for eapol-test variants while at it. Update mesh-DFS patchset from Peter Oh to v5 (with local fixes) which allows to drop two revert-patches for upstream commits which previously were necessary to un-break mesh-DFS support. 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.patch10
1 files changed, 5 insertions, 5 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
index 95b5b16a93..c96e810769 100644
--- 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
@@ -1,7 +1,7 @@
-From 95425b5becaeda8a515c942f417696e5df34bbc8 Mon Sep 17 00:00:00 2001
+From 07bad5f256cbe8a4b45d32c5b43b870ee815fb42 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
+Date: Tue, 29 May 2018 14:39:07 -0700
+Subject: [PATCH 03/18] 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
@@ -16,7 +16,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
-@@ -335,9 +335,6 @@ static int wpa_supplicant_mesh_init(stru
+@@ -336,9 +336,6 @@ static int wpa_supplicant_mesh_init(stru
return -1;
}
@@ -26,7 +26,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
return 0;
-@@ -383,6 +380,12 @@ void wpas_join_mesh(struct wpa_supplican
+@@ -384,6 +381,12 @@ void wpas_join_mesh(struct wpa_supplican
struct wpa_ssid *ssid = wpa_s->current_ssid;
int ret = 0;