aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/006-mesh-inform-kernel-driver-DFS-handler-in-userspace.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/006-mesh-inform-kernel-driver-DFS-handler-in-userspace.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/006-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch')
-rw-r--r--package/network/services/hostapd/patches/006-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/services/hostapd/patches/006-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch b/package/network/services/hostapd/patches/006-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch
index 6b51217f62..fe2353cd81 100644
--- a/package/network/services/hostapd/patches/006-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch
+++ b/package/network/services/hostapd/patches/006-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch
@@ -1,7 +1,7 @@
-From 37bf08621eee53f30b464be71876c02e235077ba Mon Sep 17 00:00:00 2001
+From 51e759da5026b3e64f801135b5d53f2198bbd2f0 Mon Sep 17 00:00:00 2001
From: Peter Oh <peter.oh@bowerswilkins.com>
-Date: Tue, 17 Apr 2018 21:55:03 -0700
-Subject: [PATCH 06/16] mesh: inform kernel driver DFS handler in userspace
+Date: Tue, 29 May 2018 14:39:10 -0700
+Subject: [PATCH 06/18] mesh: inform kernel driver DFS handler in userspace
NL80211_ATTR_HANDLE_DFS is required by kerenel space
to enable DFS channels that indicates DFS handler
@@ -38,7 +38,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
goto fail;
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
-@@ -261,6 +261,7 @@ static int wpa_supplicant_mesh_init(stru
+@@ -262,6 +262,7 @@ static int wpa_supplicant_mesh_init(stru
conf->ieee80211d = 1;
conf->country[0] = wpa_s->conf->country[0];
conf->country[1] = wpa_s->conf->country[1];