From: Michael Straube <straube.linux@gmail.com>
Date: Thu, 12 Jul 2018 10:36:08 +0000 (+0200)
Subject: staging: rtl8723bs: refactor rtw_is_cckratesonly_included
X-Git-Tag: v4.19-rc1~101^2~506
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f2a3d835dbd971224c4c6ff2e715e1056659d10;p=thirdparty%2Fkernel%2Flinux.git

staging: rtl8723bs: refactor rtw_is_cckratesonly_included

Refactor rtw_is_cckratesonly_included() to improve readability and
slightly reduce object file size.

Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 3adb58759d5ff..e4a20a4a5e591 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -81,13 +81,12 @@ uint rtw_is_cckrates_included(u8 *rate)
 
 uint rtw_is_cckratesonly_included(u8 *rate)
 {
-	u32 i = 0;
+	while (*rate) {
+		u8 r = *rate & 0x7f;
 
-	while (rate[i] != 0) {
-		if  ((((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
-		     (((rate[i]) & 0x7f) != 11)  && (((rate[i]) & 0x7f) != 22))
+		if (r != 2 && r != 4 && r != 11 && r != 22)
 			return false;
-		i++;
+		rate++;
 	}
 
 	return true;