mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 11:36:49 +00:00
323e249ce8
This updates mac80211 to version 6.1.97-1. This code is based on Linux 6.1.97 and contains all fixes included in the upstream wireless subsystem from that kernel version. This includes many bugfixes and also some security fixes. The removed patches are already integrated in upstream Linux 6.1.97 or in backports. The following patches were integrated in upstream Linux: ath11k/0013-wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_.patch ath11k/0035-wifi-ath11k-Use-platform_get_irq-to-get-the-interrup.patch ath11k/0036-wifi-ath11k-fix-SAC-bug-on-peer-addition-with-sta-ba.patch ath11k/0047-wifi-ath11k-fix-deinitialization-of-firmware-resourc.patch ath11k/0053-wifi-ath11k-fix-writing-to-unintended-memory-region.patch ath11k/0060-wifi-ath11k-Ignore-frags-from-uninitialized-peer-in-.patch ath11k/0065-wifi-ath11k-fix-tx-status-reporting-in-encap-offload.patch ath11k/0067-wifi-ath11k-Fix-SKB-corruption-in-REO-destination-ri.patch ath11k/0069-wifi-ath11k-fix-registration-of-6Ghz-only-phy-withou.patch ath11k/0080-wifi-ath11k-add-support-default-regdb-while-searchin.patch ath11k/0085-wifi-ath11k-fix-memory-leak-in-WMI-firmware-stats.patch ath11k/0086-wifi-ath11k-Add-missing-check-for-ioremap.patch ath11k/0096-wifi-ath11k-fix-boot-failure-with-one-MSI-vector.patch subsys/337-wifi-mac80211-fix-race-condition-on-enabling-fast-xm.patch The following patches were integrated in upstream backports: ath11k/901-wifi-ath11k-pci-fix-compilation-in-5.16-and-older.patch build/080-resv_start_op.patch build/110-backport_napi_build_skb.patch The following files are missing in backports, we do not have to remove them any more. Some were already missing before some were removed in this update: include/linux/cordic.h include/linux/crc8.h include/linux/eeprom_93cx6.h include/linux/wl12xx.h include/net/ieee80211.h backport-include/linux/bcm47xx_nvram.h include/linux/ath9k_platform.h include/net/bluetooth/ backports ships a dummy Mediatek wed header for older kernel versions. We backported the feature in our kernel, remove the dummy header: backport-include/linux/soc/mediatek/mtk_wed.h Remove header files for subsystems used form the mainline kernel: include/trace/events/qrtr.h include/net/rsi_91x.h backport-include/linux/platform_data/brcmnand.h Link: https://github.com/openwrt/openwrt/pull/15827 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From f4d1181e4759c9c6c97c86cda2cf2d1ddb6a74d2 Mon Sep 17 00:00:00 2001
|
|
From: Ryder Lee <ryder.lee@mediatek.com>
|
|
Date: Sat, 18 Feb 2023 01:48:59 +0800
|
|
Subject: [PATCH] wifi: mac80211: add EHT MU-MIMO related flags in
|
|
ieee80211_bss_conf
|
|
|
|
Similar to VHT/HE. This is utilized to pass MU-MIMO configurations
|
|
from user space (i.e. hostapd) to driver.
|
|
|
|
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
|
|
Link: https://lore.kernel.org/r/8d9966c4c1e77cb1ade77d42bdc49905609192e9.1676628065.git.ryder.lee@mediatek.com
|
|
[move into combined if statement, reset on !eht]
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
include/net/mac80211.h | 9 +++++++++
|
|
net/mac80211/cfg.c | 16 ++++++++++++++++
|
|
2 files changed, 25 insertions(+)
|
|
|
|
--- a/include/net/mac80211.h
|
|
+++ b/include/net/mac80211.h
|
|
@@ -676,6 +676,12 @@ struct ieee80211_fils_discovery {
|
|
* @he_full_ul_mumimo: does this BSS support the reception (AP) or transmission
|
|
* (non-AP STA) of an HE TB PPDU on an RU that spans the entire PPDU
|
|
* bandwidth
|
|
+ * @eht_su_beamformer: in AP-mode, does this BSS enable operation as an EHT SU
|
|
+ * beamformer
|
|
+ * @eht_su_beamformee: in AP-mode, does this BSS enable operation as an EHT SU
|
|
+ * beamformee
|
|
+ * @eht_mu_beamformer: in AP-mode, does this BSS enable operation as an EHT MU
|
|
+ * beamformer
|
|
*/
|
|
struct ieee80211_bss_conf {
|
|
const u8 *bssid;
|
|
@@ -764,6 +770,9 @@ struct ieee80211_bss_conf {
|
|
bool he_su_beamformee;
|
|
bool he_mu_beamformer;
|
|
bool he_full_ul_mumimo;
|
|
+ bool eht_su_beamformer;
|
|
+ bool eht_su_beamformee;
|
|
+ bool eht_mu_beamformer;
|
|
};
|
|
|
|
/**
|
|
--- a/net/mac80211/cfg.c
|
|
+++ b/net/mac80211/cfg.c
|
|
@@ -1313,6 +1313,22 @@ static int ieee80211_start_ap(struct wip
|
|
if (params->eht_cap) {
|
|
link_conf->eht_puncturing = params->punct_bitmap;
|
|
changed |= BSS_CHANGED_EHT_PUNCTURING;
|
|
+
|
|
+ link_conf->eht_su_beamformer =
|
|
+ params->eht_cap->fixed.phy_cap_info[0] &
|
|
+ IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER;
|
|
+ link_conf->eht_su_beamformee =
|
|
+ params->eht_cap->fixed.phy_cap_info[0] &
|
|
+ IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE;
|
|
+ link_conf->eht_mu_beamformer =
|
|
+ params->eht_cap->fixed.phy_cap_info[7] &
|
|
+ (IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |
|
|
+ IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ |
|
|
+ IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ);
|
|
+ } else {
|
|
+ link_conf->eht_su_beamformer = false;
|
|
+ link_conf->eht_su_beamformee = false;
|
|
+ link_conf->eht_mu_beamformer = false;
|
|
}
|
|
|
|
if (sdata->vif.type == NL80211_IFTYPE_AP &&
|