diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2018-05-31 00:10:49 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 09:05:58 +0100 |
| commit | 000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8 (patch) | |
| tree | 8a85305e20e0ea79f04a1afe12b075924d717123 /package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch | |
| parent | 0d08c6705864d0ad430dc3d7049b51bf5a218ba7 (diff) | |
| download | upstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.tar.gz upstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.tar.bz2 upstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.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>
(backported from 78f1974bc565d7544589a49ad8efd92c4ddec5b3)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch b/package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch index 9d6ac82bf6..148e90d859 100644 --- a/package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch +++ b/package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch @@ -1,14 +1,16 @@ -From 48f31256ffebfc43d6b14b93597aa2c7e2975dc4 Mon Sep 17 00:00:00 2001 +From 9423e8be0393e82c8622806a0529e47fd5583c0b Mon Sep 17 00:00:00 2001 From: Peter Oh <peter.oh@bowerswilkins.com> -Date: Tue, 17 Apr 2018 21:55:12 -0700 -Subject: [PATCH 15/16] mesh: do not use offchan mgmt tx on DFS +Date: Tue, 29 May 2018 14:39:19 -0700 +Subject: [PATCH 15/18] mesh: do not use offchan mgmt tx on DFS Drivers don't allow mesh to use offchannel on management Tx. 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] --- - src/drivers/driver_nl80211.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + src/drivers/driver_nl80211.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -23,20 +25,20 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> struct ieee80211_hdr *hdr; wpa_printf(MSG_DEBUG, "nl80211: Send Action frame (ifindex=%d, " -@@ -7190,6 +7194,12 @@ static int wpa_driver_nl80211_send_actio +@@ -7189,7 +7193,11 @@ static int wpa_driver_nl80211_send_actio + } else { 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)) && + ieee80211_is_dfs(freq, modes, num_modes)) + offchanok = 0; -+ if (is_ap_interface(drv->nlmode) && (!(drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) || (int) freq == bss->freq || drv->device_ap_sme || -@@ -7201,7 +7211,7 @@ static int wpa_driver_nl80211_send_actio +@@ -7201,7 +7209,7 @@ static int wpa_driver_nl80211_send_actio ret = nl80211_send_frame_cmd(bss, freq, wait_time, buf, 24 + data_len, &drv->send_action_cookie, |