Patch "wifi: rtl8xxxu: Fix the channel width reporting" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    wifi: rtl8xxxu: Fix the channel width reporting

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     wifi-rtl8xxxu-fix-the-channel-width-reporting.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 15bdc7772215f37ca8b82487e01fc0cac5b43340
Author: Bitterblue Smith <rtl8821cerfe2@xxxxxxxxx>
Date:   Thu Dec 1 16:15:08 2022 +0200

    wifi: rtl8xxxu: Fix the channel width reporting
    
    [ Upstream commit 76c16af2cb10282274596e21add2c9f0b95c941b ]
    
    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: 0985d3a410ac ("rtl8xxxu: Feed current txrate information for mac80211")
    Signed-off-by: Bitterblue Smith <rtl8821cerfe2@xxxxxxxxx>
    Reviewed-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
    Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/5b41f1ae-72e7-6b7a-2459-b736399a1c40@xxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 43898f105bb7..9a12f1d38007 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -5520,7 +5520,6 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)
 			rarpt->txrate.flags = 0;
 			rate = c2h->ra_report.rate;
 			sgi = c2h->ra_report.sgi;
-			bw = c2h->ra_report.bw;
 
 			if (rate < DESC_RATE_MCS0) {
 				rarpt->txrate.legacy =
@@ -5537,8 +5536,13 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)
 						RATE_INFO_FLAGS_SHORT_GI;
 				}
 
-				if (bw == RATE_INFO_BW_20)
-					rarpt->txrate.bw |= RATE_INFO_BW_20;
+				if (skb->len >= offsetofend(typeof(*c2h), ra_report.bw)) {
+					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);
 			rarpt->bit_rate = bit_rate;