mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-30 16:14:12 +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>
87 lines
2.8 KiB
Diff
87 lines
2.8 KiB
Diff
From cb9bea773c85e372931cd7a177db4165adf29d95 Mon Sep 17 00:00:00 2001
|
|
From: Aloka Dixit <quic_alokad@quicinc.com>
|
|
Date: Fri, 5 May 2023 16:11:28 +0300
|
|
Subject: [PATCH 75/77] wifi: ath11k: refactor vif parameter configurations
|
|
|
|
Security parameters for each non-transmitting profile can be
|
|
different when MBSSID is enabled and this information is included
|
|
in the MBSSID element in the Beacon frame. Current implementation
|
|
to set rsnie_present and wpaie_present does not parse this element
|
|
hence it applies only to the transmitting interface.
|
|
|
|
Move the code to a separate function to make additions for
|
|
non-transmitting interfaces cleaner.
|
|
|
|
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
|
|
|
|
Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20230405221648.17950-6-quic_alokad@quicinc.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/mac.c | 41 ++++++++++++++++-----------
|
|
1 file changed, 24 insertions(+), 17 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -1344,28 +1344,14 @@ err_mon_del:
|
|
return ret;
|
|
}
|
|
|
|
-static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)
|
|
+static void ath11k_mac_set_vif_params(struct ath11k_vif *arvif,
|
|
+ struct sk_buff *bcn)
|
|
{
|
|
- struct ath11k *ar = arvif->ar;
|
|
- struct ath11k_base *ab = ar->ab;
|
|
- struct ieee80211_hw *hw = ar->hw;
|
|
- struct ieee80211_vif *vif = arvif->vif;
|
|
- struct ieee80211_mutable_offsets offs = {};
|
|
- struct sk_buff *bcn;
|
|
struct ieee80211_mgmt *mgmt;
|
|
u8 *ies;
|
|
- int ret;
|
|
-
|
|
- if (arvif->vdev_type != WMI_VDEV_TYPE_AP)
|
|
- return 0;
|
|
-
|
|
- bcn = ieee80211_beacon_get_template(hw, vif, &offs, 0);
|
|
- if (!bcn) {
|
|
- ath11k_warn(ab, "failed to get beacon template from mac80211\n");
|
|
- return -EPERM;
|
|
- }
|
|
|
|
ies = bcn->data + ieee80211_get_hdrlen_from_skb(bcn);
|
|
+ mgmt = (struct ieee80211_mgmt *)bcn->data;
|
|
ies += sizeof(mgmt->u.beacon);
|
|
|
|
if (cfg80211_find_ie(WLAN_EID_RSN, ies, (skb_tail_pointer(bcn) - ies)))
|
|
@@ -1379,7 +1365,28 @@ static int ath11k_mac_setup_bcn_tmpl(str
|
|
arvif->wpaie_present = true;
|
|
else
|
|
arvif->wpaie_present = false;
|
|
+}
|
|
+
|
|
+static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)
|
|
+{
|
|
+ struct ath11k *ar = arvif->ar;
|
|
+ struct ath11k_base *ab = ar->ab;
|
|
+ struct ieee80211_hw *hw = ar->hw;
|
|
+ struct ieee80211_vif *vif = arvif->vif;
|
|
+ struct ieee80211_mutable_offsets offs = {};
|
|
+ struct sk_buff *bcn;
|
|
+ int ret;
|
|
+
|
|
+ if (arvif->vdev_type != WMI_VDEV_TYPE_AP)
|
|
+ return 0;
|
|
+
|
|
+ bcn = ieee80211_beacon_get_template(hw, vif, &offs, 0);
|
|
+ if (!bcn) {
|
|
+ ath11k_warn(ab, "failed to get beacon template from mac80211\n");
|
|
+ return -EPERM;
|
|
+ }
|
|
|
|
+ ath11k_mac_set_vif_params(arvif, bcn);
|
|
ret = ath11k_wmi_bcn_tmpl(ar, arvif->vdev_id, &offs, bcn);
|
|
|
|
kfree_skb(bcn);
|