diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-04 01:52:25 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-09-22 17:39:26 +0200 |
commit | 8af79550e6c280717660f66032d89d21007b15d2 (patch) | |
tree | f504628ab40056a8eed34f9b423c8be8fb0e38ed /package/network/services/hostapd/patches/016-mesh-fix-channel-switch-error-during-CAC.patch | |
parent | a03219ba09a55ad49926e5c2d60ddff095fe5096 (diff) | |
download | upstream-8af79550e6c280717660f66032d89d21007b15d2.tar.gz upstream-8af79550e6c280717660f66032d89d21007b15d2.tar.bz2 upstream-8af79550e6c280717660f66032d89d21007b15d2.zip |
hostapd: Update to version 2.8 (2019-04-21)
This also syncs the configuration files with the default configuration
files, but no extra options are activated or deactivated.
The mesh patches were partially merged into hostapd 2.8, the remaining
patches were extracted from patchwork and are now applied by OpenWrt.
The patches still have open questions which are not fixed by the author.
They were taken from this page:
https://patchwork.ozlabs.org/project/hostap/list/?series=62725&state=*
The changes in 007-mesh-apply-channel-attributes-before-running-Mesh.patch
where first applied to hostapd, but later reverted in hostapd commit
3e949655ccc5 because they caused memory leaks.
The size of the ipkgs increase a bit (between 1.3% and 2.3%):
old 2018-12-02 (2.7):
283337 wpad-basic_2018-12-02-c2c6c01b-11_mipsel_24kc.ipk
252857 wpad-mini_2018-12-02-c2c6c01b-11_mipsel_24kc.ipk
417473 wpad-openssl_2018-12-02-c2c6c01b-11_mipsel_24kc.ipk
415105 wpad-wolfssl_2018-12-02-c2c6c01b-11_mipsel_24kc.ipk
new 2019-04-21 (2.8):
288264 wpad-basic_2019-04-21-63962824-1_mipsel_24kc.ipk
256188 wpad-mini_2019-04-21-63962824-1_mipsel_24kc.ipk
427475 wpad-openssl_2019-04-21-63962824-1_mipsel_24kc.ipk
423071 wpad-wolfssl_2019-04-21-63962824-1_mipsel_24kc.ipk
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Diffstat (limited to 'package/network/services/hostapd/patches/016-mesh-fix-channel-switch-error-during-CAC.patch')
-rw-r--r-- | package/network/services/hostapd/patches/016-mesh-fix-channel-switch-error-during-CAC.patch | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/package/network/services/hostapd/patches/016-mesh-fix-channel-switch-error-during-CAC.patch b/package/network/services/hostapd/patches/016-mesh-fix-channel-switch-error-during-CAC.patch index 5071ae5151..1a8b291949 100644 --- a/package/network/services/hostapd/patches/016-mesh-fix-channel-switch-error-during-CAC.patch +++ b/package/network/services/hostapd/patches/016-mesh-fix-channel-switch-error-during-CAC.patch @@ -1,7 +1,7 @@ -From fa9d565fe8841b288f29137c23a7ab2584dd9510 Mon Sep 17 00:00:00 2001 +From 5913d6e2a741683e7c747c046f72ca790bbe1337 Mon Sep 17 00:00:00 2001 From: Peter Oh <peter.oh@bowerswilkins.com> -Date: Tue, 29 May 2018 14:39:20 -0700 -Subject: [PATCH 16/18] mesh: fix channel switch error during CAC +Date: Mon, 27 Aug 2018 14:28:47 -0700 +Subject: [PATCH 5/7] mesh: fix channel switch error during CAC Mesh interface has used its channel parameters that configured during its initialization even after channel switched due to @@ -10,30 +10,23 @@ This change fixes the error by updating its channel parameters when channel's been changed from initial one. Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> -Signed-off-by: Daniel Golle <daniel@makrotopia.org> -[daniel@makrotopia.org: added hw_features_common.h include] --- wpa_supplicant/mesh.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c -@@ -11,6 +11,7 @@ - #include "utils/common.h" - #include "utils/eloop.h" +@@ -13,6 +13,7 @@ #include "utils/uuid.h" -+#include "common/hw_features_common.h" #include "common/ieee802_11_defs.h" #include "common/wpa_ctrl.h" ++#include "common/hw_features_common.h" #include "ap/sta_info.h" -@@ -394,10 +395,35 @@ void wpa_supplicant_mesh_add_scan_ie(str - void wpas_mesh_complete_cb(void *ctx) - { - struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; -+ struct hostapd_iface *ifmsh = wpa_s->ifmsh; - struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; - struct wpa_ssid *ssid = wpa_s->current_ssid; - int ret = 0; + #include "ap/hostapd.h" + #include "ap/ieee802_11.h" +@@ -204,6 +205,30 @@ static void wpas_mesh_complete_cb(void * + return; + } + /* + * inspect if channel's been changed since initialized. @@ -59,6 +52,6 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> + } + } + - if (wpas_mesh_init_rsn(wpa_s)) { - wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh..."); - wpa_supplicant_mesh_deinit(wpa_s); + if (ifmsh->mconf->security != MESH_CONF_SEC_NONE && + wpas_mesh_init_rsn(wpa_s)) { + wpa_printf(MSG_ERROR, |