From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH v2 01/12] staging: rtl8188eu: refactor cckrates_included()
Date: Wed, 5 Dec 2018 19:30:49 +0100 [thread overview]
Message-ID: <20181205183100.16828-1-straube.linux@gmail.com> (raw)
Refactor cckrates_included() to improve readability and slightly
reduce object file size. Also change the return type to bool.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
v1 -> v2
Changed patch 10/12 in the series.
v1: staging: rtl8188eu: correct indentation in update_wireless_mode()
v2: staging: rtl8188eu: replace if else with ternary
drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 9 +++++----
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index 24918223499b..90160d5fc292 100644
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -56,13 +56,14 @@ static u8 rtw_basic_rate_mix[7] = {
IEEE80211_OFDM_RATE_24MB | IEEE80211_BASIC_RATE_MASK
};
-int cckrates_included(unsigned char *rate, int ratelen)
+bool cckrates_included(unsigned char *rate, int ratelen)
{
- int i;
+ int i;
for (i = 0; i < ratelen; i++) {
- if ((((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
- (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22))
+ u8 r = rate[i] & 0x7f;
+
+ if (r == 2 || r == 4 || r == 11 || r == 22)
return true;
}
return false;
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index 9526da3efcc4..c86dec12dec2 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -580,7 +580,7 @@ void addba_timer_hdl(struct timer_list *t);
mod_timer(&mlmeext->link_timer, jiffies + \
msecs_to_jiffies(ms))
-int cckrates_included(unsigned char *rate, int ratelen);
+bool cckrates_included(unsigned char *rate, int ratelen);
int cckratesonly_included(unsigned char *rate, int ratelen);
void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr);
--
2.19.2
next reply other threads:[~2018-12-05 18:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-05 18:30 Michael Straube [this message]
2018-12-05 18:30 ` [PATCH v2 02/12] staging: rtl8188eu: refactor cckratesonly_included() Michael Straube
2018-12-05 18:30 ` [PATCH v2 03/12] staging: rtl8188eu: simplify array initializations Michael Straube
2018-12-05 18:30 ` [PATCH v2 04/12] staging: rtl8188eu: remove unnecessary parentheses in rtw_wlan_util.c Michael Straube
2018-12-05 18:30 ` [PATCH v2 05/12] staging: rtl8188eu: cleanup declarations " Michael Straube
2018-12-05 18:30 ` [PATCH v2 06/12] staging: rtl8188eu: cleanup block comment " Michael Straube
2018-12-05 18:30 ` [PATCH v2 07/12] staging: rtl8188eu: cleanup long lines " Michael Straube
2018-12-05 18:30 ` [PATCH v2 08/12] staging: rtl8188eu: add spaces around operators " Michael Straube
2018-12-05 18:30 ` [PATCH v2 09/12] staging: rtl8188eu: write out multiplying in wifirate2_ratetbl_inx() Michael Straube
2018-12-05 18:30 ` [PATCH v2 10/12] staging: rtl8188eu: replace if else with ternary operator Michael Straube
2018-12-05 18:30 ` [PATCH v2 11/12] staging: rtl8188eu: rename struct field Wifi_Error_Status Michael Straube
2018-12-05 18:31 ` [PATCH v2 12/12] staging: rtl8188eu: remove unused code in rtw_cmd.c Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181205183100.16828-1-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).