package/kernel/mac80211/patches/subsys/392-wireless-fix-spelling-of-A-MSDU-in-HE-capabilities.patch

   1 From: Johannes Berg <johannes.berg@intel.com>
   2 Date: Fri, 9 Apr 2021 12:40:24 +0300
   3 Subject: [PATCH] wireless: fix spelling of A-MSDU in HE capabilities
   4
   5 In the HE capabilities, spell A-MSDU correctly, not "A-MDSU".
   6
   7 Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
   8 Link: https://lore.kernel.org/r/iwlwifi.20210409123755.9e6ff1af1181.If6868bc6902ccd9a95c74c78f716c4b41473ef14@changeid
   9 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  10 ---
  11
  12 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
  13 +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
  14 @@ -554,7 +554,7 @@ static const struct ieee80211_sband_ifty
  15                                         IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
  16                                         IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
  17                                 .mac_cap_info[4] =
  18 -                                       IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU |
  19 +                                       IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU |
  20                                         IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39,
  21                                 .mac_cap_info[5] =
  22                                         IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 |
  23 @@ -638,7 +638,7 @@ static const struct ieee80211_sband_ifty
  24                                         IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
  25                                         IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
  26                                 .mac_cap_info[4] =
  27 -                                       IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
  28 +                                       IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
  29                                 .mac_cap_info[5] =
  30                                         IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,
  31                                 .phy_cap_info[0] =
  32 --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
  33 +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
  34 @@ -532,7 +532,7 @@ mt7915_init_he_caps(struct mt7915_phy *p
  35                         IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
  36                         IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_RESERVED;
  37                 he_cap_elem->mac_cap_info[4] =
  38 -                       IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU;
  39 +                       IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU;
  40
  41                 if (band == NL80211_BAND_2GHZ)
  42                         he_cap_elem->phy_cap_info[0] =
  43 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
  44 +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
  45 @@ -1325,7 +1325,7 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *sk
  46         if (elem->mac_cap_info[3] & IEEE80211_HE_MAC_CAP3_OMI_CONTROL)
  47                 cap |= STA_REC_HE_CAP_OM;
  48
  49 -       if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU)
  50 +       if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU)
  51                 cap |= STA_REC_HE_CAP_AMSDU_IN_AMPDU;
  52
  53         if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_BQR)
  54 --- a/include/linux/ieee80211.h
  55 +++ b/include/linux/ieee80211.h
  56 @@ -2069,7 +2069,7 @@ int ieee80211_get_vht_max_nss(struct iee
  57  #define IEEE80211_HE_MAC_CAP4_PSR_RESP                         0x08
  58  #define IEEE80211_HE_MAC_CAP4_NDP_FB_REP                       0x10
  59  #define IEEE80211_HE_MAC_CAP4_OPS                              0x20
  60 -#define IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU                   0x40
  61 +#define IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU                   0x40
  62  /* Multi TID agg TX is split between byte #4 and #5
  63   * The value is a combination of B39,B40,B41
  64   */
  65 --- a/net/mac80211/debugfs_sta.c
  66 +++ b/net/mac80211/debugfs_sta.c
  67 @@ -735,7 +735,7 @@ static ssize_t sta_he_capa_read(struct f
  68         PFLAG(MAC, 4, PSR_RESP, "PSR-RESP");
  69         PFLAG(MAC, 4, NDP_FB_REP, "NDP-FB-REP");
  70         PFLAG(MAC, 4, OPS, "OPS");
  71 -       PFLAG(MAC, 4, AMDSU_IN_AMPDU, "AMSDU-IN-AMPDU");
  72 +       PFLAG(MAC, 4, AMSDU_IN_AMPDU, "AMSDU-IN-AMPDU");
  73
  74         PRINT("MULTI-TID-AGG-TX-QOS-%d", ((cap[5] << 1) | (cap[4] >> 7)) & 0x7);
  75
  76 --- a/drivers/net/wireless/mac80211_hwsim.c
  77 +++ b/drivers/net/wireless/mac80211_hwsim.c
  78 @@ -2796,7 +2796,7 @@ static const struct ieee80211_sband_ifty
  79                                 .mac_cap_info[3] =
  80                                         IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
  81                                         IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
  82 -                               .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
  83 +                               .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
  84                                 .phy_cap_info[1] =
  85                                         IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
  86                                         IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
  87 @@ -2840,7 +2840,7 @@ static const struct ieee80211_sband_ifty
  88                                 .mac_cap_info[3] =
  89                                         IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
  90                                         IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
  91 -                               .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
  92 +                               .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
  93                                 .phy_cap_info[1] =
  94                                         IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
  95                                         IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
  96 @@ -2886,7 +2886,7 @@ static const struct ieee80211_sband_ifty
  97                                 .mac_cap_info[3] =
  98                                         IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
  99                                         IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 100 -                               .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 101 +                               .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 102                                 .phy_cap_info[0] =
 103                                         IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
 104                                         IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
 105 @@ -2934,7 +2934,7 @@ static const struct ieee80211_sband_ifty
 106                                 .mac_cap_info[3] =
 107                                         IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 108                                         IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 109 -                               .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 110 +                               .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 111                                 .phy_cap_info[0] =
 112                                         IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
 113                                         IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |