tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Johannes Berg 2f516444 1f851b8d

+12 -12
+2 -2
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
··· 552 552 IEEE80211_HE_MAC_CAP3_OMI_CONTROL | 553 553 IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2, 554 554 .mac_cap_info[4] = 555 - IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU | 555 + IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU | 556 556 IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39, 557 557 .mac_cap_info[5] = 558 558 IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 | ··· 638 638 IEEE80211_HE_MAC_CAP3_OMI_CONTROL | 639 639 IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2, 640 640 .mac_cap_info[4] = 641 - IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU, 641 + IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU, 642 642 .mac_cap_info[5] = 643 643 IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU, 644 644 .phy_cap_info[0] =
+4 -4
drivers/net/wireless/mac80211_hwsim.c
··· 2796 2796 .mac_cap_info[3] = 2797 2797 IEEE80211_HE_MAC_CAP3_OMI_CONTROL | 2798 2798 IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3, 2799 - .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU, 2799 + .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU, 2800 2800 .phy_cap_info[1] = 2801 2801 IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK | 2802 2802 IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A | ··· 2840 2840 .mac_cap_info[3] = 2841 2841 IEEE80211_HE_MAC_CAP3_OMI_CONTROL | 2842 2842 IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3, 2843 - .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU, 2843 + .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU, 2844 2844 .phy_cap_info[1] = 2845 2845 IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK | 2846 2846 IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A | ··· 2886 2886 .mac_cap_info[3] = 2887 2887 IEEE80211_HE_MAC_CAP3_OMI_CONTROL | 2888 2888 IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3, 2889 - .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU, 2889 + .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU, 2890 2890 .phy_cap_info[0] = 2891 2891 IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | 2892 2892 IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G | ··· 2934 2934 .mac_cap_info[3] = 2935 2935 IEEE80211_HE_MAC_CAP3_OMI_CONTROL | 2936 2936 IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3, 2937 - .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU, 2937 + .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU, 2938 2938 .phy_cap_info[0] = 2939 2939 IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | 2940 2940 IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
+1 -1
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
··· 496 496 if (elem->mac_cap_info[3] & IEEE80211_HE_MAC_CAP3_OMI_CONTROL) 497 497 cap |= STA_REC_HE_CAP_OM; 498 498 499 - if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU) 499 + if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU) 500 500 cap |= STA_REC_HE_CAP_AMSDU_IN_AMPDU; 501 501 502 502 if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_BQR)
+1 -1
drivers/net/wireless/mediatek/mt76/mt7915/init.c
··· 478 478 IEEE80211_HE_MAC_CAP3_OMI_CONTROL | 479 479 IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3; 480 480 he_cap_elem->mac_cap_info[4] = 481 - IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU; 481 + IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU; 482 482 483 483 if (band == NL80211_BAND_2GHZ) 484 484 he_cap_elem->phy_cap_info[0] =
+1 -1
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
··· 1330 1330 if (elem->mac_cap_info[3] & IEEE80211_HE_MAC_CAP3_OMI_CONTROL) 1331 1331 cap |= STA_REC_HE_CAP_OM; 1332 1332 1333 - if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU) 1333 + if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU) 1334 1334 cap |= STA_REC_HE_CAP_AMSDU_IN_AMPDU; 1335 1335 1336 1336 if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_BQR)
+1 -1
drivers/net/wireless/mediatek/mt76/mt7921/main.c
··· 67 67 IEEE80211_HE_MAC_CAP3_OMI_CONTROL | 68 68 IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3; 69 69 he_cap_elem->mac_cap_info[4] = 70 - IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU; 70 + IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU; 71 71 72 72 if (band == NL80211_BAND_2GHZ) 73 73 he_cap_elem->phy_cap_info[0] =
+1 -1
include/linux/ieee80211.h
··· 2021 2021 #define IEEE80211_HE_MAC_CAP4_PSR_RESP 0x08 2022 2022 #define IEEE80211_HE_MAC_CAP4_NDP_FB_REP 0x10 2023 2023 #define IEEE80211_HE_MAC_CAP4_OPS 0x20 2024 - #define IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU 0x40 2024 + #define IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU 0x40 2025 2025 /* Multi TID agg TX is split between byte #4 and #5 2026 2026 * The value is a combination of B39,B40,B41 2027 2027 */
+1 -1
net/mac80211/debugfs_sta.c
··· 735 735 PFLAG(MAC, 4, PSR_RESP, "PSR-RESP"); 736 736 PFLAG(MAC, 4, NDP_FB_REP, "NDP-FB-REP"); 737 737 PFLAG(MAC, 4, OPS, "OPS"); 738 - PFLAG(MAC, 4, AMDSU_IN_AMPDU, "AMSDU-IN-AMPDU"); 738 + PFLAG(MAC, 4, AMSDU_IN_AMPDU, "AMSDU-IN-AMPDU"); 739 739 740 740 PRINT("MULTI-TID-AGG-TX-QOS-%d", ((cap[5] << 1) | (cap[4] >> 7)) & 0x7); 741 741