mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-14 06:32:11 +00:00
7e42fdcafe
This updates mac80211 to version 6.1.110-1. This code is based on Linux 6.1.110 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.110. The following patches were integrated in upstream Linux: subsys/311-v6.2-wifi-mac80211-fix-and-simplify-unencrypted-drop-chec.patch subsys/312-v6.3-wifi-cfg80211-move-A-MSDU-check-in-ieee80211_data_to.patch subsys/313-v6.3-wifi-cfg80211-factor-out-bridge-tunnel-RFC1042-heade.patch subsys/314-v6.3-wifi-mac80211-remove-mesh-forwarding-congestion-chec.patch subsys/315-v6.3-wifi-mac80211-fix-receiving-A-MSDU-frames-on-mesh-in.patch subsys/316-v6.3-wifi-mac80211-add-a-workaround-for-receiving-non-sta.patch subsys/321-mac80211-fix-mesh-forwarding.patch subsys/322-wifi-mac80211-fix-mesh-path-discovery-based-on-unica.patch subsys/329-wifi-mac80211-fix-receiving-mesh-packets-in-forwardi.patch subsys/339-wifi-cfg80211-fix-receving-mesh-packets-without-RFC1.patch subsys/350-v6.3-wifi-mac80211-Allow-NSS-change-only-up-to-capability.patch subsys/351-v6.9-wifi-mac80211-track-capability-opmode-NSS-separately.patch Link: https://github.com/openwrt/openwrt/pull/16368 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
From b100722a777f6455d913666a376f81342b2cb995 Mon Sep 17 00:00:00 2001
|
|
From: Muna Sinada <quic_msinada@quicinc.com>
|
|
Date: Mon, 17 Apr 2023 13:22:27 -0700
|
|
Subject: [PATCH] wifi: ath11k: Remove disabling of 80+80 and 160 MHz
|
|
|
|
This is a regression fix for 80+80 and 160 MHz support bits being
|
|
cleared, therefore not adverised. Remove disable of 80+80 and 160 MHz
|
|
capability flags and assign valid center frequency 2 similar to
|
|
VHT80_80.
|
|
|
|
Fixes: 38dfe775d0ab ("wifi: ath11k: push MU-MIMO params from hostapd to hardware")
|
|
Reported-by: Robert Marko <robert.marko@sartura.hr>
|
|
Tested-by: Robert Marko <robert.marko@sartura.hr> # IPQ8074 WLAN.HK.2.9.0.1-01385-QCAHKSWPL_SILICONZ-1
|
|
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217299
|
|
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
|
|
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
|
|
Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/1681762947-13882-1-git-send-email-quic_msinada@quicinc.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/mac.c | 4 ----
|
|
drivers/net/wireless/ath/ath11k/wmi.c | 3 ++-
|
|
2 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -5581,10 +5581,6 @@ static int ath11k_mac_copy_he_cap(struct
|
|
|
|
he_cap_elem->mac_cap_info[1] &=
|
|
IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK;
|
|
- he_cap_elem->phy_cap_info[0] &=
|
|
- ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
|
|
- he_cap_elem->phy_cap_info[0] &=
|
|
- ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;
|
|
|
|
he_cap_elem->phy_cap_info[5] &=
|
|
~IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK;
|
|
--- a/drivers/net/wireless/ath/ath11k/wmi.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
|
|
@@ -871,7 +871,8 @@ static void ath11k_wmi_put_wmi_channel(s
|
|
|
|
chan->band_center_freq2 = arg->channel.band_center_freq1;
|
|
|
|
- } else if (arg->channel.mode == MODE_11AC_VHT80_80) {
|
|
+ } else if ((arg->channel.mode == MODE_11AC_VHT80_80) ||
|
|
+ (arg->channel.mode == MODE_11AX_HE80_80)) {
|
|
chan->band_center_freq2 = arg->channel.band_center_freq2;
|
|
} else {
|
|
chan->band_center_freq2 = 0;
|