2024-01-02 19:33:22

by Bitterblue Smith

Subject: [PATCH v2] wifi: rtl8xxxu: Fix off by one initial RTS rate

rtl8xxxu_set_basic_rates() sets the wrong initial RTS rate. It sets the
next higher rate than the one it should set, e.g. 36M instead of 24M.

The while loop was supposed to find the index of the most significant
bit which is 1, but it was copied incorrectly from the vendor driver.
Use __fls() instead.

Signed-off-by: Bitterblue Smith <[email protected]>
---
v2:
- Use __fls().
---
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 180907319e8c..2b1b633a1f96 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -4839,10 +4839,9 @@ static void rtl8xxxu_set_basic_rates(struct rtl8xxxu_priv *priv, u32 rate_cfg)

dev_dbg(&priv->udev->dev, "%s: rates %08x\n", __func__, rate_cfg);

- while (rate_cfg) {
- rate_cfg = (rate_cfg >> 1);
- rate_idx++;
- }
+ if (rate_cfg)
+ rate_idx = __fls(rate_cfg);
+
rtl8xxxu_write8(priv, REG_INIRTS_RATE_SEL, rate_idx);
}

--
2.43.0

2024-01-03 01:53:22

by Ping-Ke Shih

Subject: RE: [PATCH v2] wifi: rtl8xxxu: Fix off by one initial RTS rate

> -----Original Message-----
> From: Bitterblue Smith <[email protected]>
> Sent: Wednesday, January 3, 2024 3:33 AM
> To: [email protected]
> Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
> Subject: [PATCH v2] wifi: rtl8xxxu: Fix off by one initial RTS rate
>
> rtl8xxxu_set_basic_rates() sets the wrong initial RTS rate. It sets the
> next higher rate than the one it should set, e.g. 36M instead of 24M.
>
> The while loop was supposed to find the index of the most significant
> bit which is 1, but it was copied incorrectly from the vendor driver.
> Use __fls() instead.
>
> Signed-off-by: Bitterblue Smith <[email protected]>

Reviewed-by: Ping-Ke Shih <[email protected]>

2024-01-10 14:55:53

by Kalle Valo

Subject: Re: [PATCH v2] wifi: rtl8xxxu: Fix off by one initial RTS rate

Bitterblue Smith <[email protected]> wrote:

> rtl8xxxu_set_basic_rates() sets the wrong initial RTS rate. It sets the
> next higher rate than the one it should set, e.g. 36M instead of 24M.
>
> The while loop was supposed to find the index of the most significant
> bit which is 1, but it was copied incorrectly from the vendor driver.
> Use __fls() instead.
>
> Signed-off-by: Bitterblue Smith <[email protected]>
> Reviewed-by: Ping-Ke Shih <[email protected]>

Patch applied to wireless-next.git, thanks.

80850ca041f2 wifi: rtl8xxxu: Fix off by one initial RTS rate

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches