From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
martin@kaiser.cx, fmdefrancesco@gmail.com,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 18/23] staging: r8188eu: add spaces around operators in core/rtw_wlan_util.c
Date: Mon, 16 Aug 2021 17:58:13 +0200 [thread overview]
Message-ID: <20210816155818.24005-19-straube.linux@gmail.com> (raw)
In-Reply-To: <20210816155818.24005-1-straube.linux@gmail.com>
Add missung spaces around operators in core/rtw_wlan_util.c reported
by checkpatch.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_wlan_util.c | 60 ++++++++++----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index cddacf023fa6..96f03e84b7e5 100644
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -29,20 +29,20 @@ unsigned char REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};
#define WAIT_FOR_BCN_TO_MAX (20000)
static u8 rtw_basic_rate_cck[4] = {
- IEEE80211_CCK_RATE_1MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_2MB|IEEE80211_BASIC_RATE_MASK,
- IEEE80211_CCK_RATE_5MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_11MB|IEEE80211_BASIC_RATE_MASK
+ IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK,
+ IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_11MB | IEEE80211_BASIC_RATE_MASK
};
static u8 rtw_basic_rate_ofdm[3] = {
- IEEE80211_OFDM_RATE_6MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_OFDM_RATE_12MB|IEEE80211_BASIC_RATE_MASK,
- IEEE80211_OFDM_RATE_24MB|IEEE80211_BASIC_RATE_MASK
+ IEEE80211_OFDM_RATE_6MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_OFDM_RATE_12MB | IEEE80211_BASIC_RATE_MASK,
+ IEEE80211_OFDM_RATE_24MB | IEEE80211_BASIC_RATE_MASK
};
static u8 rtw_basic_rate_mix[7] = {
- IEEE80211_CCK_RATE_1MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_2MB|IEEE80211_BASIC_RATE_MASK,
- IEEE80211_CCK_RATE_5MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_11MB|IEEE80211_BASIC_RATE_MASK,
- IEEE80211_OFDM_RATE_6MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_OFDM_RATE_12MB|IEEE80211_BASIC_RATE_MASK,
- IEEE80211_OFDM_RATE_24MB|IEEE80211_BASIC_RATE_MASK
+ IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK,
+ IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_11MB | IEEE80211_BASIC_RATE_MASK,
+ IEEE80211_OFDM_RATE_6MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_OFDM_RATE_12MB | IEEE80211_BASIC_RATE_MASK,
+ IEEE80211_OFDM_RATE_24MB | IEEE80211_BASIC_RATE_MASK
};
int cckrates_included(unsigned char *rate, int ratelen)
@@ -407,7 +407,7 @@ int is_client_associated_to_ap(struct adapter *padapter)
pmlmeext = &padapter->mlmeextpriv;
pmlmeinfo = &pmlmeext->mlmext_info;
- if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE))
+ if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE))
return true;
else
return _FAIL;
@@ -418,7 +418,7 @@ int is_client_associated_to_ibss(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
- if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE))
+ if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE))
return true;
else
return _FAIL;
@@ -475,7 +475,7 @@ void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
break;
default:
i = (j - 2) << 2;
- val = (key[i] | (key[i+1] << 8) | (key[i+2] << 16) | (key[i+3] << 24));
+ val = (key[i] | (key[i + 1] << 8) | (key[i + 2] << 16) | (key[i + 3] << 24));
break;
}
@@ -613,7 +613,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
/* entry indx: 0->vo, 1->vi, 2->be, 3->bk. */
for (i = 0; i < 4; i++) {
- for (j = i+1; j < 4; j++) {
+ for (j = i + 1; j < 4; j++) {
/* compare CW and AIFS */
if ((edca[j] & 0xFFFF) < (edca[i] & 0xFFFF)) {
change_inx = true;
@@ -942,7 +942,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
ht_info_infos_0 = 0;
}
if (ht_cap_info != cur_network->BcnInfo.ht_cap_info ||
- ((ht_info_infos_0&0x03) != (cur_network->BcnInfo.ht_info_infos_0&0x03))) {
+ ((ht_info_infos_0 & 0x03) != (cur_network->BcnInfo.ht_info_infos_0 & 0x03))) {
DBG_88E("%s bcn now: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
ht_cap_info, ht_info_infos_0);
DBG_88E("%s bcn link: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
@@ -1029,14 +1029,14 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
}
if (encryp_protocol == ENCRYP_PROTOCOL_WPA || encryp_protocol == ENCRYP_PROTOCOL_WPA2) {
- pbuf = rtw_get_wpa_ie(&bssid->IEs[12], &wpa_ielen, bssid->IELength-12);
+ pbuf = rtw_get_wpa_ie(&bssid->IEs[12], &wpa_ielen, bssid->IELength - 12);
if (pbuf && (wpa_ielen > 0)) {
- rtw_parse_wpa_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is_8021x);
+ rtw_parse_wpa_ie(pbuf, wpa_ielen + 2, &group_cipher, &pairwise_cipher, &is_8021x);
} else {
- pbuf = rtw_get_wpa2_ie(&bssid->IEs[12], &wpa_ielen, bssid->IELength-12);
+ pbuf = rtw_get_wpa2_ie(&bssid->IEs[12], &wpa_ielen, bssid->IELength - 12);
if (pbuf && (wpa_ielen > 0))
- rtw_parse_wpa2_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is_8021x);
+ rtw_parse_wpa2_ie(pbuf, wpa_ielen + 2, &group_cipher, &pairwise_cipher, &is_8021x);
}
if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || group_cipher != cur_network->BcnInfo.group_cipher) {
@@ -1193,40 +1193,40 @@ int wifirate2_ratetbl_inx(unsigned char rate)
rate = rate & 0x7f;
switch (rate) {
- case 54*2:
+ case 54 * 2:
inx = 11;
break;
- case 48*2:
+ case 48 * 2:
inx = 10;
break;
- case 36*2:
+ case 36 * 2:
inx = 9;
break;
- case 24*2:
+ case 24 * 2:
inx = 8;
break;
- case 18*2:
+ case 18 * 2:
inx = 7;
break;
- case 12*2:
+ case 12 * 2:
inx = 6;
break;
- case 9*2:
+ case 9 * 2:
inx = 5;
break;
- case 6*2:
+ case 6 * 2:
inx = 4;
break;
- case 11*2:
+ case 11 * 2:
inx = 3;
break;
case 11:
inx = 2;
break;
- case 2*2:
+ case 2 * 2:
inx = 1;
break;
- case 1*2:
+ case 1 * 2:
inx = 0;
break;
}
@@ -1584,7 +1584,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
if (psta) {
param = le16_to_cpu(preq->BA_para_set);
- tid = (param>>2)&0x0f;
+ tid = (param >> 2) & 0x0f;
preorder_ctrl = &psta->recvreorder_ctrl[tid];
preorder_ctrl->indicate_seq = 0xffff;
preorder_ctrl->enable = (pmlmeinfo->bAcceptAddbaReq) ? true : false;
@@ -1599,7 +1599,7 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
pIE = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);
pbuf = (__le32 *)pIE;
- pmlmeext->TSFValue = le32_to_cpu(*(pbuf+1));
+ pmlmeext->TSFValue = le32_to_cpu(*(pbuf + 1));
pmlmeext->TSFValue = pmlmeext->TSFValue << 32;
--
2.32.0
next prev parent reply other threads:[~2021-08-16 15:59 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-16 15:57 [PATCH 00/23] staging: r8188eu: clean up spacing style issues in core dir Michael Straube
2021-08-16 15:57 ` [PATCH 01/23] staging: r8188eu: add spaces around operators in core/rtw_ap.c Michael Straube
2021-08-16 15:57 ` [PATCH 02/23] staging: r8188eu: rewrite subtraction in core/rtw_cmd.c Michael Straube
2021-08-16 15:57 ` [PATCH 03/23] staging: r8188eu: remove unnecessary parentheses " Michael Straube
2021-08-16 15:57 ` [PATCH 04/23] staging: r8188eu: clean up spacing style issues " Michael Straube
2021-08-16 15:58 ` [PATCH 05/23] staging: r8188eu: clean up spacing style issues in core/rtw_efuse.c Michael Straube
2021-08-16 15:58 ` [PATCH 06/23] staging: r8188eu: clean up spacing style issues in core/rtw_ieee80211.c Michael Straube
2021-08-16 15:58 ` [PATCH 07/23] staging: r8188eu: simplify multiplication in core/rtw_ioctl_set.c Michael Straube
2021-08-16 15:58 ` [PATCH 08/23] staging: r8188eu: clean up spacing style issues " Michael Straube
2021-08-16 15:58 ` [PATCH 09/23] staging: r8188eu: add spaces around operators in core/rtw_iol.c Michael Straube
2021-08-16 15:58 ` [PATCH 10/23] staging: r8188eu: clean up spacing style issues in core/rtw_mlme.c Michael Straube
2021-08-16 15:58 ` [PATCH 11/23] staging: r8188eu: clean up spacing style issues in core/rtw_mlme_ext.c Michael Straube
2021-08-16 15:58 ` [PATCH 12/23] staging: r8188eu: clean up spacing style issues in core/rtw_mp.c Michael Straube
2021-08-16 15:58 ` [PATCH 13/23] staging: r8188eu: clean up spacing style issues in core/rtw_mp_ioctl.c Michael Straube
2021-08-16 15:58 ` [PATCH 14/23] staging: r8188eu: clean up spacing style issues in core/rtw_p2p.c Michael Straube
2021-08-16 15:58 ` [PATCH 15/23] staging: r8188eu: clean up spacing style issues in core/rtw_pwrctrl.c Michael Straube
2021-08-16 15:58 ` [PATCH 16/23] staging: r8188eu: clean up spacing style issues in core/rtw_recv.c Michael Straube
2021-08-16 15:58 ` [PATCH 17/23] staging: r8188eu: clean up spacing style issues in core/rtw_security.c Michael Straube
2021-08-16 15:58 ` Michael Straube [this message]
2021-08-16 15:58 ` [PATCH 19/23] staging: r8188eu: clean up spacing style issues in core/rtw_xmit.c Michael Straube
2021-08-16 15:58 ` [PATCH 20/23] staging: r8188eu: clean up spacing style issues in core/rtw_debug.c Michael Straube
2021-08-16 15:58 ` [PATCH 21/23] staging: r8188eu: add space around operator in core/rtw_sreset.c Michael Straube
2021-08-16 15:58 ` [PATCH 22/23] staging: r8188eu: clean up spacing style issues in core/rtw_sta_mgt.c Michael Straube
2021-08-16 15:58 ` [PATCH 23/23] staging: r8188eu: add spaces around operators in core/rtw_br_ext.c Michael Straube
2021-08-24 8:58 ` [PATCH 00/23] staging: r8188eu: clean up spacing style issues in core dir Dan Carpenter
2021-08-24 10:25 ` 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=20210816155818.24005-19-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=fmdefrancesco@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--cc=phil@philpotter.co.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.