Skip to contentSkip to conversation

wifi: rtw89: 8922a: fix incorrect STA-ID in EHT MU PPDU

PATCH In review Ping-Ke Shih 1 participant 2 messages Feb 17, 2025 – Feb 21, 2025 Realtek wireless driver (rtw89)

lore
Share & tools
lore

Ping-Ke Shih

author maintainer
#0 lore raw

PATCH 1/1 wifi: rtw89: 8922a: fix incorrect STA-ID in EHT MU PPDU

From: Kuan-Chung Chen <[email protected]>

EHT MU PPDU contains user field of EHT-SIG field with STA-ID that must match AID subfield in the Associate Response. Add a necessary setting to prevent these from being inconsistent.

Signed-off-by Kuan-Chung Chen <[email protected]>
Signed-off-by Ping-Ke Shih <[email protected]>
---
 drivers/net/wireless/realtek/rtw89/fw.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +3 -2
index 35b86970db2a..6dbea18355a3 100644
@@ -3435,9 +3435,10 @@ int rtw89_fw_h2c_assoc_cmac_tbl_g7(struct rtw89_dev *rtwdev,
 			      CCTLINFO_G7_W5_NOMINAL_PKT_PADDING3 |
 			      CCTLINFO_G7_W5_NOMINAL_PKT_PADDING4);
 
-	h2c->w6 = le32_encode_bits(vif->type == NL80211_IFTYPE_STATION ? 1 : 0,
+	h2c->w6 = le32_encode_bits(vif->cfg.aid, CCTLINFO_G7_W6_AID12_PAID) |
+		  le32_encode_bits(vif->type == NL80211_IFTYPE_STATION ? 1 : 0,
 				   CCTLINFO_G7_W6_ULDL);
-	h2c->m6 = cpu_to_le32(CCTLINFO_G7_W6_ULDL);
+	h2c->m6 = cpu_to_le32(CCTLINFO_G7_W6_AID12_PAID | CCTLINFO_G7_W6_ULDL);
 
 	if (rtwsta_link) {
 		h2c->w8 = le32_encode_bits(link_sta->he_cap.has_he,
Signature · 1 line
2.25.1
author maintainer
#1 lore raw
Quoted 8 lines · Ping-Ke Shih

From: Kuan-Chung Chen <[email protected]>

EHT MU PPDU contains user field of EHT-SIG field with STA-ID that must match AID subfield in the Associate Response. Add a necessary setting to prevent these from being inconsistent.

Signed-off-by Kuan-Chung Chen <[email protected]>
Signed-off-by Ping-Ke Shih <[email protected]>

1 patch(es) applied to rtw-next branch of rtw.git, thanks.

bdce0574243b wifi: rtw89: 8922a: fix incorrect STA-ID in EHT MU PPDU

---
https://github.com/pkshih/rtw.git