From: Bitterblue Smith Date: Tue, 2 Jan 2024 19:33:07 +0000 (+0200) Subject: wifi: rtl8xxxu: Fix off by one initial RTS rate X-Git-Tag: block-6.9-20240315~27^2~432^2~69 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=80850ca041f2c7ee28fa5e47c5c1b106415f099f;p=linux-block.git 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 Reviewed-by: Ping-Ke Shih Signed-off-by: Kalle Valo Link: https://msgid.link/761e6836-6cd6-4930-91b6-0446834655c5@gmail.com --- diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index 921d25e152cf..aac594093629 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -4870,10 +4870,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); }