]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
wifi: rtl8xxxu: Remove copy-paste leftover in gen2_update_rate_mask
authorBitterblue Smith <rtl8821cerfe2@gmail.com>
Fri, 2 Sep 2022 13:15:30 +0000 (16:15 +0300)
committerStefan Bader <stefan.bader@canonical.com>
Thu, 24 Nov 2022 13:24:17 +0000 (14:24 +0100)
BugLink: https://bugs.launchpad.net/bugs/1996825
[ Upstream commit d5350756c03cdf18696295c6b11d7acc4dbf825c ]

It looks like a leftover from copying rtl8xxxu_update_rate_mask,
which is used with the gen1 chips.

It wasn't causing any problems for my RTL8188FU test device, but it's
clearly a mistake, so remove it.

Fixes: f653e69009c6 ("rtl8xxxu: Implement basic 8723b specific update_rate_mask() function")
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/d5544fe8-9798-28f1-54bd-6839a1974b10@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

index a74ded84c2acea4967f387ff60672297e96013da..fb2a5fc1a4e65fdf867745e8e0b929bd7f6a3c00 100644 (file)
@@ -4338,15 +4338,14 @@ void rtl8xxxu_gen2_update_rate_mask(struct rtl8xxxu_priv *priv,
        h2c.b_macid_cfg.ramask2 = (ramask >> 16) & 0xff;
        h2c.b_macid_cfg.ramask3 = (ramask >> 24) & 0xff;
 
-       h2c.ramask.arg = 0x80;
        h2c.b_macid_cfg.data1 = rateid;
        if (sgi)
                h2c.b_macid_cfg.data1 |= BIT(7);
 
        h2c.b_macid_cfg.data2 = bw;
 
-       dev_dbg(&priv->udev->dev, "%s: rate mask %08x, arg %02x, size %zi\n",
-               __func__, ramask, h2c.ramask.arg, sizeof(h2c.b_macid_cfg));
+       dev_dbg(&priv->udev->dev, "%s: rate mask %08x, rateid %02x, sgi %d, size %zi\n",
+               __func__, ramask, rateid, sgi, sizeof(h2c.b_macid_cfg));
        rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.b_macid_cfg));
 }