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>
76 lines
2.4 KiB
Diff
76 lines
2.4 KiB
Diff
From 570eec3d40505c30babbe3b8f85a38496c975ab2 Mon Sep 17 00:00:00 2001
|
|
From: Maharaja Kennadyrajan <quic_mkenna@quicinc.com>
|
|
Date: Tue, 9 May 2023 20:07:23 +0300
|
|
Subject: [PATCH] wifi: ath11k: Relocate the func
|
|
ath11k_mac_bitrate_mask_num_ht_rates() and change hweight16 to hweight8
|
|
|
|
Relocate the function ath11k_mac_bitrate_mask_num_ht_rates() definition
|
|
to call this function from other functions which helps to avoid the
|
|
compilation error (function not defined).
|
|
|
|
ht_mcs[] is 1 byte array and it is enough to use hweight8() instead
|
|
of hweight16(). Hence, fixed the same.
|
|
|
|
Tested on: Compile tested only.
|
|
|
|
Signed-off-by: Maharaja Kennadyrajan <quic_mkenna@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20230504092033.3542456-2-quic_mkenna@quicinc.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/mac.c | 30 +++++++++++++--------------
|
|
1 file changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -1,7 +1,7 @@
|
|
// SPDX-License-Identifier: BSD-3-Clause-Clear
|
|
/*
|
|
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
|
|
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
|
|
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
|
*/
|
|
|
|
#include <net/mac80211.h>
|
|
@@ -4335,6 +4335,20 @@ exit:
|
|
}
|
|
|
|
static int
|
|
+ath11k_mac_bitrate_mask_num_ht_rates(struct ath11k *ar,
|
|
+ enum nl80211_band band,
|
|
+ const struct cfg80211_bitrate_mask *mask)
|
|
+{
|
|
+ int num_rates = 0;
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(mask->control[band].ht_mcs); i++)
|
|
+ num_rates += hweight8(mask->control[band].ht_mcs[i]);
|
|
+
|
|
+ return num_rates;
|
|
+}
|
|
+
|
|
+static int
|
|
ath11k_mac_bitrate_mask_num_vht_rates(struct ath11k *ar,
|
|
enum nl80211_band band,
|
|
const struct cfg80211_bitrate_mask *mask)
|
|
@@ -7788,20 +7802,6 @@ static void ath11k_mac_op_flush(struct i
|
|
ath11k_mac_flush_tx_complete(ar);
|
|
}
|
|
|
|
-static int
|
|
-ath11k_mac_bitrate_mask_num_ht_rates(struct ath11k *ar,
|
|
- enum nl80211_band band,
|
|
- const struct cfg80211_bitrate_mask *mask)
|
|
-{
|
|
- int num_rates = 0;
|
|
- int i;
|
|
-
|
|
- for (i = 0; i < ARRAY_SIZE(mask->control[band].ht_mcs); i++)
|
|
- num_rates += hweight16(mask->control[band].ht_mcs[i]);
|
|
-
|
|
- return num_rates;
|
|
-}
|
|
-
|
|
static bool
|
|
ath11k_mac_has_single_legacy_rate(struct ath11k *ar,
|
|
enum nl80211_band band,
|