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

Commit 8bbedf4d authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

mac80211: minstrel: fix using short preamble CCK rates on HT clients 



[ Upstream commit 37439f2d6e43ae79e22be9be159f0af157468f82 ]

mi->supported[MINSTREL_CCK_GROUP] needs to be updated
short preamble rates need to be marked as supported regardless of
whether it's currently enabled. Its state can change at any time without
a rate_update call.

Fixes: 782dda00 ("mac80211: minstrel_ht: move short preamble check out of get_rate")
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5d017065

net/mac80211/rc80211_minstrel_ht.c

+1 −3
Original line number Diff line number Diff line
@@ -1132,7 +1132,6 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, 
	struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;

	u16 sta_cap = sta->ht_cap.cap;

	struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;

	struct sta_info *sinfo = container_of(sta, struct sta_info, sta);

	int use_vht;

	int n_supported = 0;

	int ack_dur;
@@ -1258,8 +1257,7 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, 
	if (!n_supported)

		goto use_legacy;



	if (test_sta_flag(sinfo, WLAN_STA_SHORT_PREAMBLE))

		mi->cck_supported_short |= mi->cck_supported_short << 4;

	mi->supported[MINSTREL_CCK_GROUP] |= mi->cck_supported_short << 4;



	/* create an initial rate table with the lowest supported rates */

	minstrel_ht_update_stats(mp, mi);