56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From b82a67a4ac91e8146ba10456e178a91c547becde Mon Sep 17 00:00:00 2001
|
|
From: Peter Oh <peter.oh@bowerswilkins.com>
|
|
Date: Tue, 30 Jun 2020 14:19:01 +0200
|
|
Subject: [PATCH] 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
|
|
resides in userspace.
|
|
|
|
Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
|
|
|
|
---
|
|
src/drivers/driver.h | 1 +
|
|
src/drivers/driver_nl80211.c | 3 +++
|
|
wpa_supplicant/mesh.c | 1 +
|
|
3 files changed, 5 insertions(+)
|
|
|
|
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
|
|
index 350c1cb57..49a580077 100644
|
|
--- a/src/drivers/driver.h
|
|
+++ b/src/drivers/driver.h
|
|
@@ -1542,6 +1542,7 @@ struct wpa_driver_mesh_join_params {
|
|
#define WPA_DRIVER_MESH_FLAG_SAE_AUTH 0x00000004
|
|
#define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008
|
|
unsigned int flags;
|
|
+ u8 handle_dfs;
|
|
};
|
|
|
|
struct wpa_driver_set_key_params {
|
|
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
|
|
index 6a612a4cb..b218af226 100644
|
|
--- a/src/drivers/driver_nl80211.c
|
|
+++ b/src/drivers/driver_nl80211.c
|
|
@@ -10070,6 +10070,9 @@ static int nl80211_join_mesh(struct i802_bss *bss,
|
|
|
|
wpa_printf(MSG_DEBUG, " * flags=%08X", params->flags);
|
|
|
|
+ if (params->handle_dfs)
|
|
+ if (nla_put_flag(msg, NL80211_ATTR_HANDLE_DFS))
|
|
+ goto fail;
|
|
container = nla_nest_start(msg, NL80211_ATTR_MESH_SETUP);
|
|
if (!container)
|
|
goto fail;
|
|
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
|
|
index 15c285812..c350e762b 100644
|
|
--- a/wpa_supplicant/mesh.c
|
|
+++ b/wpa_supplicant/mesh.c
|
|
@@ -355,6 +355,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
|
|
conf->country[0] = wpa_s->conf->country[0];
|
|
conf->country[1] = wpa_s->conf->country[1];
|
|
conf->country[2] = ' ';
|
|
+ wpa_s->mesh_params->handle_dfs = 1;
|
|
}
|
|
|
|
bss->iconf = conf;
|