mirror of
https://github.com/armbian/build.git
synced 2025-08-18 21:11:02 +02:00
9b611efc21
* Add megous files for 5.16, tag orange-pi-5.16-20220216-2000 * Optimize the selection of a set of patches * Remove unused patches * Fix the state on the version tag=v5.16.11 Signed-off-by: The-going <48602507+The-going@users.noreply.github.com> Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
From 0a47ed80540ea17353174b032780280c9a0463d2 Mon Sep 17 00:00:00 2001
|
|
From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
|
|
Date: Fri, 26 Nov 2021 10:48:19 +0100
|
|
Subject: [PATCH 502/562] ieee80211: change HE nominal packet padding value
|
|
defines
|
|
|
|
It's easier to use and understand, and to extend for EHT later,
|
|
if we use the values here instead of the shifted values.
|
|
|
|
Unfortunately, we need to add _POS so that we can use it in
|
|
places like iwlwifi/mvm where constants are needed.
|
|
|
|
While at it, fix the typo ("NOMIMAL") which also helps catch any
|
|
conflicts.
|
|
|
|
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
|
|
Link: https://lore.kernel.org/r/20211126104817.7c29a05b8eb5.I2ca9faf06e177e3035bec91e2ae53c2f91d41774@changeid
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
drivers/net/wireless/realtek/rtw89/core.c | 3 ++-
|
|
drivers/net/wireless/realtek/rtw89/fw.c | 2 +-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
|
|
index d02ec5a735cb..2bbe77ae7713 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/core.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/core.c
|
|
@@ -2115,7 +2115,8 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev,
|
|
IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |
|
|
IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |
|
|
IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |
|
|
- IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US;
|
|
+ u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,
|
|
+ IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);
|
|
if (i == NL80211_IFTYPE_STATION)
|
|
phy_cap_info[9] |= IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU;
|
|
he_cap->he_mcs_nss_supp.rx_mcs_80 = cpu_to_le16(mcs_map);
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
|
|
index 65ef3dc9d061..31e38cbe236b 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/fw.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
|
|
@@ -780,7 +780,7 @@ static void __get_sta_he_pkt_padding(struct rtw89_dev *rtwdev,
|
|
if (!ppe_th) {
|
|
u8 pad;
|
|
|
|
- pad = FIELD_GET(IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK,
|
|
+ pad = FIELD_GET(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK,
|
|
sta->he_cap.he_cap_elem.phy_cap_info[9]);
|
|
|
|
for (i = 0; i < RTW89_PPE_BW_NUM; i++)
|
|
--
|
|
2.34.1
|
|
|