mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	The BSS short preamble state can change without rate control update notification. Signed-off-by: Felix Fietkau <nbd@nbd.name>
		
			
				
	
	
		
			32 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			32 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From: Felix Fietkau <nbd@nbd.name>
 | 
						|
Date: Sat, 10 Feb 2018 13:43:07 +0100
 | 
						|
Subject: [PATCH] mac80211: minstrel: fix using short preamble CCK rates on
 | 
						|
 HT clients
 | 
						|
 | 
						|
mi->supported[MINSTREL_CCK_GROUP] needs to be updated
 | 
						|
 | 
						|
Fixes: 782dda00ab8e ("mac80211: minstrel_ht: move short preamble check out of get_rate")
 | 
						|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
						|
---
 | 
						|
 | 
						|
--- a/net/mac80211/rc80211_minstrel_ht.c
 | 
						|
+++ b/net/mac80211/rc80211_minstrel_ht.c
 | 
						|
@@ -1135,7 +1135,6 @@ minstrel_ht_update_caps(void *priv, stru
 | 
						|
 	struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
 | 
						|
 	u16 ht_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;
 | 
						|
@@ -1267,8 +1266,7 @@ minstrel_ht_update_caps(void *priv, stru
 | 
						|
 	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);
 |