mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
fb98c8a610
No functional changes, just some renames to make it easier to keep mt76 in sync with upstream Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry-picked from commite62c550470) (cherry-picked from commita889dcd3f2)
114 lines
4.9 KiB
Diff
114 lines
4.9 KiB
Diff
From: Johannes Berg <johannes.berg@intel.com>
|
|
Date: Fri, 9 Apr 2021 12:40:24 +0300
|
|
Subject: [PATCH] wireless: fix spelling of A-MSDU in HE capabilities
|
|
|
|
In the HE capabilities, spell A-MSDU correctly, not "A-MDSU".
|
|
|
|
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
|
|
Link: https://lore.kernel.org/r/iwlwifi.20210409123755.9e6ff1af1181.If6868bc6902ccd9a95c74c78f716c4b41473ef14@changeid
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
@@ -598,7 +598,7 @@ static struct ieee80211_sband_iftype_dat
|
|
IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
|
|
IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
|
|
.mac_cap_info[4] =
|
|
- IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU |
|
|
+ IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU |
|
|
IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39,
|
|
.mac_cap_info[5] =
|
|
IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 |
|
|
@@ -682,7 +682,7 @@ static struct ieee80211_sband_iftype_dat
|
|
IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
|
|
IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
|
|
.mac_cap_info[4] =
|
|
- IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
|
|
+ IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
|
|
.mac_cap_info[5] =
|
|
IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,
|
|
.phy_cap_info[0] =
|
|
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
|
|
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
|
|
@@ -427,7 +427,7 @@ mt7915_init_he_caps(struct mt7915_phy *p
|
|
IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
|
|
IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_RESERVED;
|
|
he_cap_elem->mac_cap_info[4] =
|
|
- IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU;
|
|
+ IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU;
|
|
|
|
if (band == NL80211_BAND_2GHZ)
|
|
he_cap_elem->phy_cap_info[0] =
|
|
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
|
|
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
|
|
@@ -1353,7 +1353,7 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *sk
|
|
if (elem->mac_cap_info[3] & IEEE80211_HE_MAC_CAP3_OMI_CONTROL)
|
|
cap |= STA_REC_HE_CAP_OM;
|
|
|
|
- if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU)
|
|
+ if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU)
|
|
cap |= STA_REC_HE_CAP_AMSDU_IN_AMPDU;
|
|
|
|
if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_BQR)
|
|
--- a/include/linux/ieee80211.h
|
|
+++ b/include/linux/ieee80211.h
|
|
@@ -2068,7 +2068,7 @@ int ieee80211_get_vht_max_nss(struct iee
|
|
#define IEEE80211_HE_MAC_CAP4_PSR_RESP 0x08
|
|
#define IEEE80211_HE_MAC_CAP4_NDP_FB_REP 0x10
|
|
#define IEEE80211_HE_MAC_CAP4_OPS 0x20
|
|
-#define IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU 0x40
|
|
+#define IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU 0x40
|
|
/* Multi TID agg TX is split between byte #4 and #5
|
|
* The value is a combination of B39,B40,B41
|
|
*/
|
|
--- a/net/mac80211/debugfs_sta.c
|
|
+++ b/net/mac80211/debugfs_sta.c
|
|
@@ -735,7 +735,7 @@ static ssize_t sta_he_capa_read(struct f
|
|
PFLAG(MAC, 4, PSR_RESP, "PSR-RESP");
|
|
PFLAG(MAC, 4, NDP_FB_REP, "NDP-FB-REP");
|
|
PFLAG(MAC, 4, OPS, "OPS");
|
|
- PFLAG(MAC, 4, AMDSU_IN_AMPDU, "AMSDU-IN-AMPDU");
|
|
+ PFLAG(MAC, 4, AMSDU_IN_AMPDU, "AMSDU-IN-AMPDU");
|
|
|
|
PRINT("MULTI-TID-AGG-TX-QOS-%d", ((cap[5] << 1) | (cap[4] >> 7)) & 0x7);
|
|
|
|
--- a/drivers/net/wireless/mac80211_hwsim.c
|
|
+++ b/drivers/net/wireless/mac80211_hwsim.c
|
|
@@ -2748,7 +2748,7 @@ static const struct ieee80211_sband_ifty
|
|
.mac_cap_info[3] =
|
|
IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
|
|
IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
|
|
- .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
|
|
+ .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
|
|
.phy_cap_info[1] =
|
|
IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
|
|
IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
|
|
@@ -2792,7 +2792,7 @@ static const struct ieee80211_sband_ifty
|
|
.mac_cap_info[3] =
|
|
IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
|
|
IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
|
|
- .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
|
|
+ .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
|
|
.phy_cap_info[1] =
|
|
IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
|
|
IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
|
|
@@ -2838,7 +2838,7 @@ static const struct ieee80211_sband_ifty
|
|
.mac_cap_info[3] =
|
|
IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
|
|
IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
|
|
- .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
|
|
+ .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
|
|
.phy_cap_info[0] =
|
|
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
|
|
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
|
|
@@ -2886,7 +2886,7 @@ static const struct ieee80211_sband_ifty
|
|
.mac_cap_info[3] =
|
|
IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
|
|
IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
|
|
- .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
|
|
+ .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
|
|
.phy_cap_info[0] =
|
|
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
|
|
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
|