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

Commit 271518ad authored by Eyal Shapira's avatar Eyal Shapira Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: don't enable VHT MCS9 in 20Mhz 



MCS9 in NSS=1 or NSS=2 isn't valid for 20Mhz so don't enable
it in case we're dealing with a 20Mhz sta. Trying to configure an
MCS9 rate with 20Mhz in the LQ rate table would lead to a FW assert.

Signed-off-by: default avatarEyal Shapira <eyal@wizery.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 393b9e5b

drivers/net/wireless/iwlwifi/mvm/rs.c

+10 −0
Original line number Diff line number Diff line
@@ -2241,6 +2241,11 @@ static void rs_vht_set_enabled_rates(struct ieee80211_sta *sta, 
			if (i == IWL_RATE_9M_INDEX)

				continue;



			/* VHT MCS9 isn't valid for 20Mhz for NSS=1,2 */

			if (i == IWL_RATE_MCS_9_INDEX &&

			    sta->bandwidth == IEEE80211_STA_RX_BW_20)

				continue;



			lq_sta->active_siso_rate |= BIT(i);

		}

	}
@@ -2251,6 +2256,11 @@ static void rs_vht_set_enabled_rates(struct ieee80211_sta *sta, 
			if (i == IWL_RATE_9M_INDEX)

				continue;



			/* VHT MCS9 isn't valid for 20Mhz for NSS=1,2 */

			if (i == IWL_RATE_MCS_9_INDEX &&

			    sta->bandwidth == IEEE80211_STA_RX_BW_20)

				continue;



			lq_sta->active_mimo2_rate |= BIT(i);

		}

	}