78f1974bc5
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>
27 lines
935 B
Diff
27 lines
935 B
Diff
From 267395271c1a36b54ef21070acff2cadce241035 Mon Sep 17 00:00:00 2001
|
|
From: Peter Oh <peter.oh@bowerswilkins.com>
|
|
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.
|
|
|
|
Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
|
|
---
|
|
wpa_supplicant/mesh.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/wpa_supplicant/mesh.c
|
|
+++ b/wpa_supplicant/mesh.c
|
|
@@ -337,7 +337,10 @@ static int wpa_supplicant_mesh_init(stru
|
|
rate_len * sizeof(int));
|
|
conf->basic_rates[rate_len] = -1;
|
|
}
|
|
-
|
|
+ /* Do not allow primary/secondary channel switch in mesh mode,
|
|
+ * since mesh is not able to establish a physical link for it
|
|
+ */
|
|
+ conf->no_pri_sec_switch = 1;
|
|
wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
|
|
|
|
if (wpa_drv_init_mesh(wpa_s)) {
|