TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: rtl8xxxu: Fix the channel width reporting

Browse Source 
[ Upstream commit 76c16af2cb ]

The gen 2 chips RTL8192EU and RTL8188FU periodically send the driver
reports about the TX rate, and the driver passes these reports to
sta_statistics. The reports from RTL8192EU may or may not include the
channel width. The reports from RTL8188FU do not include it.

Only access the c2h->ra_report.bw field if the report (skb) is big
enough.

The other problem fixed here is that the code was actually never
changing the channel width initially reported by
rtl8xxxu_bss_info_changed because the value of RATE_INFO_BW_20 is 0.

Fixes: 0985d3a410 ("rtl8xxxu: Feed current txrate information for mac80211")
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/5b41f1ae-72e7-6b7a-2459-b736399a1c40@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Bitterblue Smith
2022-12-01 16:15:08 +02:00
committed by Greg Kroah-Hartman
parent d430037248
commit f89c0fbb8b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+7 -3
View File
@@ -5520,7 +5520,6 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)
rarpt->txrate.flags = 0; rarpt->txrate.flags = 0;
rate = c2h->ra_report.rate; rate = c2h->ra_report.rate;
sgi = c2h->ra_report.sgi; sgi = c2h->ra_report.sgi;
bw = c2h->ra_report.bw;
if (rate < DESC_RATE_MCS0) { if (rate < DESC_RATE_MCS0) {
rarpt->txrate.legacy = rarpt->txrate.legacy =
@@ -5537,8 +5536,13 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)
RATE_INFO_FLAGS_SHORT_GI; RATE_INFO_FLAGS_SHORT_GI;
} }
if (bw == RATE_INFO_BW_20) if (skb->len >= offsetofend(typeof(*c2h), ra_report.bw)) {
rarpt->txrate.bw |= RATE_INFO_BW_20; if (c2h->ra_report.bw == RTL8XXXU_CHANNEL_WIDTH_40)
bw = RATE_INFO_BW_40;
else
bw = RATE_INFO_BW_20;
rarpt->txrate.bw = bw;
}
} }
bit_rate = cfg80211_calculate_bitrate(&rarpt->txrate); bit_rate = cfg80211_calculate_bitrate(&rarpt->txrate);
rarpt->bit_rate = bit_rate; rarpt->bit_rate = bit_rate;