Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76707e34 authored by Naftali Goldstein's avatar Naftali Goldstein Committed by Greg Kroah-Hartman
Browse files

iwlwifi: fw: do not set sgi bits for HE connection 



[ Upstream commit 5c2dbebb446539eb9640bf59a02756d6e7f1fc53 ]

If the association supports HE, HT/VHT rates will never be used for Tx
and therefore there's no need to set the sgi-per-channel-width-support
bits, so don't set them in this case.

Fixes: 110b32f0 ("iwlwifi: mvm: rs: add basic implementation of the new RS API handlers")
Signed-off-by: default avatarNaftali Goldstein <naftali.goldstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3a11ec54

drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c

+4 −0
Original line number Diff line number Diff line
@@ -98,8 +98,12 @@ static u8 rs_fw_sgi_cw_support(struct ieee80211_sta *sta) 
{

	struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;

	struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;

	struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;

	u8 supp = 0;



	if (he_cap && he_cap->has_he)

		return 0;



	if (ht_cap->cap & IEEE80211_HT_CAP_SGI_20)

		supp |= BIT(IWL_TLC_MNG_CH_WIDTH_20MHZ);

	if (ht_cap->cap & IEEE80211_HT_CAP_SGI_40)