Commit 1f851b8d authored by Johannes Berg's avatar Johannes Berg
Browse files

wireless: align HE capabilities A-MPDU Length Exponent Extension 



The A-MPDU length exponent extension is defined differently in
802.11ax D6.1, align with that.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210409123755.c2a257d3e2df.I3455245d388c52c61dace7e7958dbed7e807cfb6@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 76cf4221

drivers/net/wireless/ath/ath11k/mac.c

+2 −3
Original line number Diff line number Diff line
@@ -1265,9 +1265,8 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar, 
	 * request, then use MAX_AMPDU_LEN_FACTOR as 16 to calculate max_ampdu

	 * length.

	 */

	ampdu_factor = (he_cap->he_cap_elem.mac_cap_info[3] &

			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK) >>

			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_SHIFT;

	ampdu_factor = u8_get_bits(he_cap->he_cap_elem.mac_cap_info[3],

				   IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK);



	if (ampdu_factor) {

		if (sta->vht_cap.vht_supported)

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+2 −2
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2,

				.mac_cap_info[4] =

					IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU |

					IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39,
@@ -636,7 +636,7 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					IEEE80211_HE_MAC_CAP2_BSR,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2,

				.mac_cap_info[4] =

					IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

				.mac_cap_info[5] =

drivers/net/wireless/mac80211_hwsim.c

+4 −4
Original line number Diff line number Diff line
@@ -2795,7 +2795,7 @@ static const struct ieee80211_sband_iftype_data he_capa_2ghz[] = { 
					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

				.phy_cap_info[1] =

					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
@@ -2839,7 +2839,7 @@ static const struct ieee80211_sband_iftype_data he_capa_2ghz[] = { 
					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

				.phy_cap_info[1] =

					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
@@ -2885,7 +2885,7 @@ static const struct ieee80211_sband_iftype_data he_capa_5ghz[] = { 
					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

				.phy_cap_info[0] =

					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
@@ -2933,7 +2933,7 @@ static const struct ieee80211_sband_iftype_data he_capa_5ghz[] = { 
					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

				.phy_cap_info[0] =

					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |

drivers/net/wireless/mediatek/mt76/mt7915/init.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, 
			IEEE80211_HE_MAC_CAP0_HTC_HE;

		he_cap_elem->mac_cap_info[3] =

			IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_RESERVED;

			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3;

		he_cap_elem->mac_cap_info[4] =

			IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU;

drivers/net/wireless/mediatek/mt76/mt7921/main.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band, 
			IEEE80211_HE_MAC_CAP0_HTC_HE;

		he_cap_elem->mac_cap_info[3] =

			IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_RESERVED;

			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3;

		he_cap_elem->mac_cap_info[4] =

			IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU;