mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
34705946e2
Drop outdated and by now broken patchset originally supplied by Peter Oh in August 2018 but never merged upstream. Instead add the more promissing rework recently submitted by Markus Theil who picked up Peter's patchset, fixed and completed it and added support for HE (802.11ax) in mesh mode. This is only compile tested and needs some real-life testing. Fixes: FS#3214 Fixes:167028b750("hostapd: Update to version 2.9 (2019-08-08)") Fixes:0a3ec87a66("hostapd: update to latest Git hostap_2_9-1238-gdd2daf0848ed") Fixes:017320ead3("hostapd: bring back mesh patches") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From af8dcbc87466ed6472850a4f1cfe252652cb3d26 Mon Sep 17 00:00:00 2001
|
|
From: Peter Oh <peter.oh@bowerswilkins.com>
|
|
Date: Tue, 30 Jun 2020 14:18:59 +0200
|
|
Subject: [PATCH 11/19] mesh: do not set offchanok on DFS channels in non-ETSI
|
|
|
|
mac80211 does not allow mgmt tx to use off channel on
|
|
DFS channels in non-ETSI domain, because it will invalidate
|
|
CAC result on current operating channel.
|
|
(mac80211 commit: 34373d12f3cbb74960a73431138ef619d857996f)
|
|
Hence don't set offchanok for mgmt tx in case of DFS channels
|
|
in non-ETSI.
|
|
|
|
Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
|
|
---
|
|
src/drivers/driver_nl80211.c | 19 +++++++++++++++++++
|
|
1 file changed, 19 insertions(+)
|
|
|
|
--- a/src/drivers/driver_nl80211.c
|
|
+++ b/src/drivers/driver_nl80211.c
|
|
@@ -7788,7 +7788,11 @@ static int wpa_driver_nl80211_send_actio
|
|
int ret = -1;
|
|
u8 *buf;
|
|
struct ieee80211_hdr *hdr;
|
|
+ struct hostapd_hw_modes *modes;
|
|
int offchanok = 1;
|
|
+ u16 num_modes, flags;
|
|
+ u8 dfs_domain;
|
|
+ int i;
|
|
|
|
if (is_ap_interface(drv->nlmode) && (int) freq == bss->freq &&
|
|
bss->beacon_set)
|
|
@@ -7817,6 +7821,21 @@ static int wpa_driver_nl80211_send_actio
|
|
os_memset(bss->rand_addr, 0, ETH_ALEN);
|
|
}
|
|
|
|
+ if (is_mesh_interface(drv->nlmode)) {
|
|
+ modes = nl80211_get_hw_feature_data(bss, &num_modes,
|
|
+ &flags, &dfs_domain);
|
|
+ if (dfs_domain != HOSTAPD_DFS_REGION_ETSI &&
|
|
+ ieee80211_is_dfs(bss->freq, modes, num_modes))
|
|
+ offchanok = 0;
|
|
+ if (modes) {
|
|
+ for (i = 0; i < num_modes; i++) {
|
|
+ os_free(modes[i].channels);
|
|
+ os_free(modes[i].rates);
|
|
+ }
|
|
+ os_free(modes);
|
|
+ }
|
|
+ }
|
|
+
|
|
if (is_ap_interface(drv->nlmode) &&
|
|
(!(drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) ||
|
|
(int) freq == bss->freq || drv->device_ap_sme ||
|