aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/013-mesh-do-not-allow-pri-sec-channel-switch.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/013-mesh-do-not-allow-pri-sec-channel-switch.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/013-mesh-do-not-allow-pri-sec-channel-switch.patch')
-rw-r--r--package/network/services/hostapd/patches/013-mesh-do-not-allow-pri-sec-channel-switch.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/services/hostapd/patches/013-mesh-do-not-allow-pri-sec-channel-switch.patch b/package/network/services/hostapd/patches/013-mesh-do-not-allow-pri-sec-channel-switch.patch
index c98afa5148..2d818b0835 100644
--- a/package/network/services/hostapd/patches/013-mesh-do-not-allow-pri-sec-channel-switch.patch
+++ b/package/network/services/hostapd/patches/013-mesh-do-not-allow-pri-sec-channel-switch.patch
@@ -1,7 +1,7 @@
-From d7ae7271dce4203bfcd79a230acb24f03f38633d Mon Sep 17 00:00:00 2001
+From 267395271c1a36b54ef21070acff2cadce241035 Mon Sep 17 00:00:00 2001
From: Peter Oh <peter.oh@bowerswilkins.com>
-Date: Tue, 17 Apr 2018 21:55:10 -0700
-Subject: [PATCH 13/16] mesh: do not allow pri/sec channel switch
+Date: Tue, 29 May 2018 14:39:17 -0700
+Subject: [PATCH 13/18] mesh: do not allow pri/sec channel switch
We don't want mesh to switch the channel from primary to secondary,
since mesh points are not able to join each other in that case.
@@ -13,7 +13,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
-@@ -336,7 +336,10 @@ static int wpa_supplicant_mesh_init(stru
+@@ -337,7 +337,10 @@ static int wpa_supplicant_mesh_init(stru
rate_len * sizeof(int));
conf->basic_rates[rate_len] = -1;
}