aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/002-mesh-factor-out-rsn-initialization.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/002-mesh-factor-out-rsn-initialization.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/002-mesh-factor-out-rsn-initialization.patch')
-rw-r--r--package/network/services/hostapd/patches/002-mesh-factor-out-rsn-initialization.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/services/hostapd/patches/002-mesh-factor-out-rsn-initialization.patch b/package/network/services/hostapd/patches/002-mesh-factor-out-rsn-initialization.patch
index 322f1c16ea..26e872d765 100644
--- a/package/network/services/hostapd/patches/002-mesh-factor-out-rsn-initialization.patch
+++ b/package/network/services/hostapd/patches/002-mesh-factor-out-rsn-initialization.patch
@@ -1,7 +1,7 @@
-From 6da64b1e056e0b1be18b6ab37c820acb4a0f3cf4 Mon Sep 17 00:00:00 2001
+From 89db76eeff6502dfa39b011962ec9d560ed4c2ee Mon Sep 17 00:00:00 2001
From: Peter Oh <peter.oh@bowerswilkins.com>
-Date: Tue, 17 Apr 2018 21:54:59 -0700
-Subject: [PATCH 02/16] mesh: factor out rsn initialization
+Date: Tue, 29 May 2018 14:39:06 -0700
+Subject: [PATCH 02/18] mesh: factor out rsn initialization
RSN initialization can be used in different phases
if mesh initialization and mesh join don't happen
@@ -80,7 +80,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
int rate_len;
int frequency;
-@@ -291,38 +335,8 @@ static int wpa_supplicant_mesh_init(stru
+@@ -292,38 +336,8 @@ static int wpa_supplicant_mesh_init(stru
return -1;
}