mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
b1677a562c
* mac80211: bump to 5.8-rc2 changelog: dfe0bc8 mac80211: allow ACS restriction with fixed channel 727685c mac80211: rt2x00: define RF5592 in init_eeprom routine cfd2f3b mac80211: create channel list for fixed channel operation d1100c7 mac80211: Update to version 5.7.5-1 ed2015c mac80211: Update to version 5.8-rc2-1 a956c14 mac80211: util: don't warn on missing sband iftype data 8b3e170 hostapd: fix incorrect service name 68bf5a9 mac80211: don't kill wireless daemon on teardown 25e0ae6 mac80211: make cfg80211 testmode support optional (and disabled by default) b7727a8 mac80211: fix AQL issues 3d731fc mac80211: merge performance improvement patches * mt76: update to 2020-07-22 Signed-off-by: Felix Fietkau <nbd@nbd.name> * mac80211: allow VHT on 2.4GHz Allow VHT rate on 2.4GHz in order to use 256-QAM Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn> * ath10k: allow VHT on 2.4GHz Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn> * hostapd: add vendor_vht option hostapd has vendor_vht option to enable VHT (256-QAM) on 2.4GHz Add this option to hostapd.sh so users can enable it via uci Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn> * ipq807x: Refresh kernel configuration Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * ipq807x: Add WCSS bus This is needed to build ath11k. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * mac80211: Add ath11k This adds the Qualcomm 802.11ax wireless chipset support. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Co-authored-by: Felix Fietkau <nbd@nbd.name> Co-authored-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn> Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de>
94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
From 1eab0e62920f443f8814bad846f6439843223b69 Mon Sep 17 00:00:00 2001
|
|
From: Markus Theil <markus.theil@tu-ilmenau.de>
|
|
Date: Tue, 30 Jun 2020 14:19:06 +0200
|
|
Subject: [PATCH 18/19] mesh: move mesh freq setting to own function
|
|
|
|
Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
|
|
---
|
|
wpa_supplicant/mesh.c | 59 ++++++++++++++++++++++++++-----------------
|
|
1 file changed, 36 insertions(+), 23 deletions(-)
|
|
|
|
--- a/wpa_supplicant/mesh.c
|
|
+++ b/wpa_supplicant/mesh.c
|
|
@@ -201,6 +201,40 @@ static int wpas_mesh_init_rsn(struct wpa
|
|
return !wpa_s->mesh_rsn ? -1 : 0;
|
|
}
|
|
|
|
+
|
|
+static int wpas_mesh_update_freq_params(struct wpa_supplicant *wpa_s)
|
|
+{
|
|
+ struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params;
|
|
+ struct hostapd_iface *ifmsh = wpa_s->ifmsh;
|
|
+ struct he_capabilities *he_capab = NULL;
|
|
+
|
|
+ if (ifmsh->current_mode)
|
|
+ he_capab = &ifmsh->current_mode->he_capab[IEEE80211_MODE_MESH];
|
|
+
|
|
+ if (hostapd_set_freq_params(¶ms->freq,
|
|
+ ifmsh->conf->hw_mode,
|
|
+ ifmsh->freq,
|
|
+ ifmsh->conf->channel,
|
|
+ ifmsh->conf->enable_edmg,
|
|
+ ifmsh->conf->edmg_channel,
|
|
+ ifmsh->conf->ieee80211n,
|
|
+ ifmsh->conf->ieee80211ac,
|
|
+ ifmsh->conf->ieee80211ax,
|
|
+ ifmsh->conf->secondary_channel,
|
|
+ hostapd_get_oper_chwidth(ifmsh->conf),
|
|
+ hostapd_get_oper_centr_freq_seg0_idx(ifmsh->conf),
|
|
+ hostapd_get_oper_centr_freq_seg1_idx(ifmsh->conf),
|
|
+ ifmsh->conf->vht_capab,
|
|
+ he_capab)) {
|
|
+ wpa_printf(MSG_ERROR, "Error updating mesh frequency params.");
|
|
+ wpa_supplicant_mesh_deinit(wpa_s, true);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
static int wpas_mesh_complete(struct wpa_supplicant *wpa_s)
|
|
{
|
|
struct hostapd_iface *ifmsh = wpa_s->ifmsh;
|
|
@@ -221,30 +255,8 @@ static int wpas_mesh_complete(struct wpa
|
|
if (ifmsh->freq > 0 && ifmsh->freq != params->freq.freq) {
|
|
wpa_s->assoc_freq = ifmsh->freq;
|
|
ssid->frequency = ifmsh->freq;
|
|
- struct he_capabilities *he_capab = NULL;
|
|
-
|
|
- if (ifmsh->current_mode)
|
|
- he_capab = &ifmsh->current_mode->he_capab[IEEE80211_MODE_MESH];
|
|
-
|
|
- if (hostapd_set_freq_params(¶ms->freq,
|
|
- ifmsh->conf->hw_mode,
|
|
- ifmsh->freq,
|
|
- ifmsh->conf->channel,
|
|
- ifmsh->conf->enable_edmg,
|
|
- ifmsh->conf->edmg_channel,
|
|
- ifmsh->conf->ieee80211n,
|
|
- ifmsh->conf->ieee80211ac,
|
|
- ifmsh->conf->ieee80211ax,
|
|
- ifmsh->conf->secondary_channel,
|
|
- hostapd_get_oper_chwidth(ifmsh->conf),
|
|
- hostapd_get_oper_centr_freq_seg0_idx(ifmsh->conf),
|
|
- hostapd_get_oper_centr_freq_seg1_idx(ifmsh->conf),
|
|
- ifmsh->conf->vht_capab,
|
|
- he_capab)) {
|
|
- wpa_printf(MSG_ERROR, "Error updating mesh frequency params.");
|
|
- wpa_supplicant_mesh_deinit(wpa_s, true);
|
|
+ if (wpas_mesh_update_freq_params(wpa_s) != 0)
|
|
return -1;
|
|
- }
|
|
}
|
|
|
|
if (ifmsh->mconf->security != MESH_CONF_SEC_NONE &&
|
|
@@ -518,6 +530,7 @@ static int wpa_supplicant_mesh_init(stru
|
|
}
|
|
|
|
return 0;
|
|
+
|
|
out_free:
|
|
wpa_supplicant_mesh_deinit(wpa_s, true);
|
|
return -ENOMEM;
|