aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/005-mesh-reflect-country-setting-to-mesh-configuration.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/005-mesh-reflect-country-setting-to-mesh-configuration.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/005-mesh-reflect-country-setting-to-mesh-configuration.patch')
-rw-r--r--package/network/services/hostapd/patches/005-mesh-reflect-country-setting-to-mesh-configuration.patch12
1 files changed, 7 insertions, 5 deletions
diff --git a/package/network/services/hostapd/patches/005-mesh-reflect-country-setting-to-mesh-configuration.patch b/package/network/services/hostapd/patches/005-mesh-reflect-country-setting-to-mesh-configuration.patch
index 6f7a968259..a372230d07 100644
--- a/package/network/services/hostapd/patches/005-mesh-reflect-country-setting-to-mesh-configuration.patch
+++ b/package/network/services/hostapd/patches/005-mesh-reflect-country-setting-to-mesh-configuration.patch
@@ -1,7 +1,7 @@
-From e2f13b1fac9799db83a37fc57df9471d9bb5b711 Mon Sep 17 00:00:00 2001
+From dbe9afab3b2dceb35d478ac43dfcf8fdc5e23a22 Mon Sep 17 00:00:00 2001
From: Peter Oh <peter.oh@bowerswilkins.com>
-Date: Tue, 17 Apr 2018 21:55:02 -0700
-Subject: [PATCH 05/16] mesh: reflect country setting to mesh configuration
+Date: Tue, 29 May 2018 14:39:09 -0700
+Subject: [PATCH 05/18] mesh: reflect country setting to mesh configuration
wpa_supplicant configuration has country parameter that is
supposed to be used in AP mode to indicate supporting 802.11h
@@ -9,9 +9,11 @@ and 802.11d. Reflect this configuration to Mesh also since Mesh
is required to support 802.11h and 802.11d to use DFS channels.
Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+[daniel@makrotopia.org: adapted to changed ieee80211_is_dfs prototype]
---
- wpa_supplicant/mesh.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ wpa_supplicant/mesh.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c