aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2018-05-31 00:10:49 +0200
committerJo-Philipp Wich <jo@mein.io>2018-12-18 09:05:58 +0100
commit000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8 (patch)
tree8a85305e20e0ea79f04a1afe12b075924d717123 /package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch
parent0d08c6705864d0ad430dc3d7049b51bf5a218ba7 (diff)
downloadupstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.tar.gz
upstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.tar.bz2
upstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.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> (backported from 78f1974bc565d7544589a49ad8efd92c4ddec5b3) (rebased patches) Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch')
-rw-r--r--package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch b/package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch
index af0148bc4e..56554ef02f 100644
--- a/package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch
+++ b/package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch
@@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
-@@ -214,7 +214,7 @@ static int wpa_supplicant_mesh_init(stru
+@@ -215,7 +215,7 @@ static int wpa_supplicant_mesh_init(stru
return 0;
}