mac80211: Update to version 5.11.22-1

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / subsys / 391-wireless-align-some-HE-capabilities-with-the-spec.patch

diff --git a/package/kernel/mac80211/patches/subsys/391-wireless-align-some-HE-capabilities-with-the-spec.patch b/package/kernel/mac80211/patches/subsys/391-wireless-align-some-HE-capabilities-with-the-spec.patch
index eb32c49890f560795863468a44888df21d5c8ab7..33cd29bd458ccfab96434d6a9da488d06dd00726 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/391-wireless-align-some-HE-capabilities-with-the-spec.patch
+++ b/package/kernel/mac80211/patches/subsys/391-wireless-align-some-HE-capabilities-with-the-spec.patch
@@ -12,7 +12,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 
 --- a/drivers/net/wireless/ath/ath11k/mac.c
 +++ b/drivers/net/wireless/ath/ath11k/mac.c
-@@ -3627,7 +3627,7 @@ ath11k_mac_filter_he_cap_mesh(struct iee
+@@ -3656,7 +3656,7 @@ ath11k_mac_filter_he_cap_mesh(struct iee
            IEEE80211_HE_MAC_CAP4_BQR;
        he_cap_elem->mac_cap_info[4] &= ~m;
  
@@ -21,7 +21,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
            IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |
            IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING |
            IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX;
-@@ -3637,7 +3637,7 @@ ath11k_mac_filter_he_cap_mesh(struct iee
+@@ -3666,7 +3666,7 @@ ath11k_mac_filter_he_cap_mesh(struct iee
            IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;
        he_cap_elem->phy_cap_info[2] &= ~m;
  
@@ -30,7 +30,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
            IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK |
            IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK;
        he_cap_elem->phy_cap_info[3] &= ~m;
-@@ -3649,13 +3649,13 @@ ath11k_mac_filter_he_cap_mesh(struct iee
+@@ -3678,13 +3678,13 @@ ath11k_mac_filter_he_cap_mesh(struct iee
        he_cap_elem->phy_cap_info[5] &= ~m;
  
        m = IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |
@@ -49,7 +49,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
        he_cap_elem->phy_cap_info[7] &= ~m;
 --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
 +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
-@@ -307,8 +307,8 @@ mt7915_set_stream_he_txbf_caps(struct ie
+@@ -423,8 +423,8 @@ mt7915_set_stream_he_txbf_caps(struct ie
            IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK;
        elem->phy_cap_info[5] &= ~c;
  
@@ -60,8 +60,8 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
        elem->phy_cap_info[6] &= ~c;
  
        elem->phy_cap_info[7] &= ~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK;
-@@ -348,8 +348,8 @@ mt7915_set_stream_he_txbf_caps(struct ie
-       c = (nss - 1) | (max_t(int, mcs->tx_mcs_160, 1) << 3);
+@@ -461,8 +461,8 @@ mt7915_set_stream_he_txbf_caps(struct ie
+       c = (nss - 1) | (max_t(int, le16_to_cpu(mcs->tx_mcs_160), 1) << 3);
        elem->phy_cap_info[5] |= c;
  
 -      c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
@@ -69,9 +69,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 +      c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |
 +          IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB;
        elem->phy_cap_info[6] |= c;
- }
  
-@@ -484,7 +484,7 @@ mt7915_init_he_caps(struct mt7915_phy *p
+       /* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */
+@@ -589,7 +589,7 @@ mt7915_init_he_caps(struct mt7915_phy *p
                                IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |
                                IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;
                        he_cap_elem->phy_cap_info[7] |=
@@ -82,7 +82,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
                                IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |
 --- a/include/linux/ieee80211.h
 +++ b/include/linux/ieee80211.h
-@@ -2065,7 +2065,7 @@ int ieee80211_get_vht_max_nss(struct iee
+@@ -2066,7 +2066,7 @@ int ieee80211_get_vht_max_nss(struct iee
  #define IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG            0x01
  #define IEEE80211_HE_MAC_CAP4_QTP                             0x02
  #define IEEE80211_HE_MAC_CAP4_BQR                             0x04
@@ -91,7 +91,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  #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
-@@ -2076,7 +2076,7 @@ int ieee80211_get_vht_max_nss(struct iee
+@@ -2077,7 +2077,7 @@ int ieee80211_get_vht_max_nss(struct iee
  
  #define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40                0x01
  #define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41                0x02
@@ -100,7 +100,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  #define IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU                        0x08
  #define IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX               0x10
  #define IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS                        0x20
-@@ -2134,7 +2134,7 @@ int ieee80211_get_vht_max_nss(struct iee
+@@ -2135,7 +2135,7 @@ int ieee80211_get_vht_max_nss(struct iee
  #define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK                   0x18
  #define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1                                0x00
  #define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_2                                0x20
@@ -109,7 +109,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  #define IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER                           0x80
  
  #define IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE                           0x01
-@@ -2181,15 +2181,15 @@ int ieee80211_get_vht_max_nss(struct iee
+@@ -2182,15 +2182,15 @@ int ieee80211_get_vht_max_nss(struct iee
  
  #define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU                     0x01
  #define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU                     0x02
@@ -185,7 +185,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
        PFLAG_RANGE(PHY, 7, MAX_NC, 0, 1, 1, "MAX-NC-%d");
 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
 +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
-@@ -631,7 +631,7 @@ static struct ieee80211_sband_iftype_dat
+@@ -587,7 +587,7 @@ static const struct ieee80211_sband_ifty
                                .phy_cap_info[6] =
                                        IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,
                                .phy_cap_info[7] =