mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
000a3fef0a
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 78f1974bc5)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From dbe9afab3b2dceb35d478ac43dfcf8fdc5e23a22 Mon Sep 17 00:00:00 2001
|
|
From: Peter Oh <peter.oh@bowerswilkins.com>
|
|
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
|
|
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 | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
--- a/wpa_supplicant/mesh.c
|
|
+++ b/wpa_supplicant/mesh.c
|
|
@@ -255,6 +255,15 @@ static int wpa_supplicant_mesh_init(stru
|
|
bss->conf->start_disabled = 1;
|
|
bss->conf->mesh = MESH_ENABLED;
|
|
bss->conf->ap_max_inactivity = wpa_s->conf->mesh_max_inactivity;
|
|
+
|
|
+ if (ieee80211_is_dfs(ssid->frequency, wpa_s->hw.modes,
|
|
+ wpa_s->hw.num_modes) && wpa_s->conf->country[0]) {
|
|
+ conf->ieee80211h = 1;
|
|
+ conf->ieee80211d = 1;
|
|
+ conf->country[0] = wpa_s->conf->country[0];
|
|
+ conf->country[1] = wpa_s->conf->country[1];
|
|
+ }
|
|
+
|
|
bss->iconf = conf;
|
|
ifmsh->conf = conf;
|
|
|