]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: rtl8188eu: fix HighestRate check in odm_ARFBRefresh_8188E()
authorDenis Efremov <efremov@linux.com>
Thu, 26 Sep 2019 07:31:38 +0000 (10:31 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 19 Dec 2019 15:57:51 +0000 (15:57 +0000)
commit 22d67a01d8d89552b989c9651419824bb4111200 upstream.

It's incorrect to compare HighestRate with 0x0b twice in the following
manner "if (HighestRate > 0x0b) ... else if (HighestRate > 0x0b) ...". The
"else if" branch is constantly false. The second comparision should be
with 0x03 according to the max_rate_idx in ODM_RAInfo_Init().

Cc: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Denis Efremov <efremov@linux.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Link: https://lore.kernel.org/r/20190926073138.12109-1-efremov@linux.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.16: adjust filename, indentation]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c

index dea220b507ad98260e76492beeaf83d7b930c9bf..e9b82222fd4d62e5f15f0a9d8c07a69230077103 100644 (file)
@@ -403,7 +403,7 @@ static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_inf
                        pRaInfo->PTModeSS = 3;
                else if (pRaInfo->HighestRate > 0x0b)
                        pRaInfo->PTModeSS = 2;
-               else if (pRaInfo->HighestRate > 0x0b)
+               else if (pRaInfo->HighestRate > 0x03)
                        pRaInfo->PTModeSS = 1;
                else
                        pRaInfo->PTModeSS = 0;