mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +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.3 KiB
Diff
69 lines
2.3 KiB
Diff
From: Muna Sinada <quic_msinada@quicinc.com>
|
|
Date: Wed, 5 Oct 2022 14:54:45 -0700
|
|
Subject: [PATCH] wifi: mac80211: Add VHT MU-MIMO related flags in
|
|
ieee80211_bss_conf
|
|
|
|
Adding flags for SU Beamformer, SU Beamformee, MU Beamformer and
|
|
MU Beamformee for VHT. This is utilized to pass MU-MIMO
|
|
configurations from user space to driver in AP mode.
|
|
|
|
Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
|
|
Link: https://lore.kernel.org/r/1665006886-23874-1-git-send-email-quic_msinada@quicinc.com
|
|
[fixed indentation, removed redundant !!]
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
|
|
--- a/include/net/mac80211.h
|
|
+++ b/include/net/mac80211.h
|
|
@@ -653,6 +653,14 @@ struct ieee80211_fils_discovery {
|
|
* write-protected by sdata_lock and local->mtx so holding either is fine
|
|
* for read access.
|
|
* @color_change_color: the bss color that will be used after the change.
|
|
+ * @vht_su_beamformer: in AP mode, does this BSS support operation as an VHT SU
|
|
+ * beamformer
|
|
+ * @vht_su_beamformee: in AP mode, does this BSS support operation as an VHT SU
|
|
+ * beamformee
|
|
+ * @vht_mu_beamformer: in AP mode, does this BSS support operation as an VHT MU
|
|
+ * beamformer
|
|
+ * @vht_mu_beamformee: in AP mode, does this BSS support operation as an VHT MU
|
|
+ * beamformee
|
|
*/
|
|
struct ieee80211_bss_conf {
|
|
const u8 *bssid;
|
|
@@ -726,6 +734,11 @@ struct ieee80211_bss_conf {
|
|
|
|
bool color_change_active;
|
|
u8 color_change_color;
|
|
+
|
|
+ bool vht_su_beamformer;
|
|
+ bool vht_su_beamformee;
|
|
+ bool vht_mu_beamformer;
|
|
+ bool vht_mu_beamformee;
|
|
};
|
|
|
|
/**
|
|
--- a/net/mac80211/cfg.c
|
|
+++ b/net/mac80211/cfg.c
|
|
@@ -1255,6 +1255,21 @@ static int ieee80211_start_ap(struct wip
|
|
prev_beacon_int = link_conf->beacon_int;
|
|
link_conf->beacon_int = params->beacon_interval;
|
|
|
|
+ if (params->vht_cap) {
|
|
+ link_conf->vht_su_beamformer =
|
|
+ params->vht_cap->vht_cap_info &
|
|
+ cpu_to_le32(IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);
|
|
+ link_conf->vht_su_beamformee =
|
|
+ params->vht_cap->vht_cap_info &
|
|
+ cpu_to_le32(IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);
|
|
+ link_conf->vht_mu_beamformer =
|
|
+ params->vht_cap->vht_cap_info &
|
|
+ cpu_to_le32(IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE);
|
|
+ link_conf->vht_mu_beamformee =
|
|
+ params->vht_cap->vht_cap_info &
|
|
+ cpu_to_le32(IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);
|
|
+ }
|
|
+
|
|
if (params->he_cap && params->he_oper) {
|
|
link_conf->he_support = true;
|
|
link_conf->htc_trig_based_pkt_ext =
|