mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-01 06:04:48 -04:00
staging: r8188eu: add spaces around operators in core/rtw_wlan_util.c
Add missung spaces around operators in core/rtw_wlan_util.c reported by checkpatch. Signed-off-by: Michael Straube <straube.linux@gmail.com> Link: https://lore.kernel.org/r/20210816155818.24005-19-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
88a924bf3f
commit
2dcdb9d1a6
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user