Commit 8e7f59e5 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

staging: rtl8188eu: add spaces around operators in rtw_ap.c

Add spaces around '+', '-' and '|' to follow kernel coding style.
Reported by checkpatch.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 523275a8
...@@ -922,7 +922,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) ...@@ -922,7 +922,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
pht_cap->mcs.rx_mask[0] = 0xff; pht_cap->mcs.rx_mask[0] = 0xff;
pht_cap->mcs.rx_mask[1] = 0x0; pht_cap->mcs.rx_mask[1] = 0x0;
memcpy(&pmlmepriv->htpriv.ht_cap, p+2, ie_len); memcpy(&pmlmepriv->htpriv.ht_cap, p + 2, ie_len);
} }
/* parsing HT_INFO_IE */ /* parsing HT_INFO_IE */
...@@ -1122,9 +1122,11 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter) ...@@ -1122,9 +1122,11 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)
struct ndis_802_11_var_ie *pIE = (struct ndis_802_11_var_ie *)p; struct ndis_802_11_var_ie *pIE = (struct ndis_802_11_var_ie *)p;
if (pmlmepriv->num_sta_non_erp == 1) if (pmlmepriv->num_sta_non_erp == 1)
pIE->data[0] |= RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION; pIE->data[0] |= RTW_ERP_INFO_NON_ERP_PRESENT |
RTW_ERP_INFO_USE_PROTECTION;
else else
pIE->data[0] &= ~(RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION); pIE->data[0] &= ~(RTW_ERP_INFO_NON_ERP_PRESENT |
RTW_ERP_INFO_USE_PROTECTION);
if (pmlmepriv->num_sta_no_short_preamble > 0) if (pmlmepriv->num_sta_no_short_preamble > 0)
pIE->data[0] |= RTW_ERP_INFO_BARKER_PREAMBLE_MODE; pIE->data[0] |= RTW_ERP_INFO_BARKER_PREAMBLE_MODE;
...@@ -1153,12 +1155,13 @@ static void update_bcn_wps_ie(struct adapter *padapter) ...@@ -1153,12 +1155,13 @@ static void update_bcn_wps_ie(struct adapter *padapter)
if (!pwps_ie_src) if (!pwps_ie_src)
return; return;
pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen); pwps_ie = rtw_get_wps_ie(ie + _FIXED_IE_LENGTH_,
ielen - _FIXED_IE_LENGTH_, NULL, &wps_ielen);
if (!pwps_ie || wps_ielen == 0) if (!pwps_ie || wps_ielen == 0)
return; return;
wps_offset = (uint)(pwps_ie-ie); wps_offset = (uint)(pwps_ie - ie);
premainder_ie = pwps_ie + wps_ielen; premainder_ie = pwps_ie + wps_ielen;
...@@ -1171,15 +1174,15 @@ static void update_bcn_wps_ie(struct adapter *padapter) ...@@ -1171,15 +1174,15 @@ static void update_bcn_wps_ie(struct adapter *padapter)
} }
wps_ielen = (uint)pwps_ie_src[1];/* to get ie data len */ wps_ielen = (uint)pwps_ie_src[1];/* to get ie data len */
if ((wps_offset+wps_ielen+2+remainder_ielen) <= MAX_IE_SZ) { if ((wps_offset + wps_ielen + 2 + remainder_ielen) <= MAX_IE_SZ) {
memcpy(pwps_ie, pwps_ie_src, wps_ielen+2); memcpy(pwps_ie, pwps_ie_src, wps_ielen + 2);
pwps_ie += (wps_ielen+2); pwps_ie += (wps_ielen + 2);
if (pbackup_remainder_ie) if (pbackup_remainder_ie)
memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen); memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen);
/* update ie_length */ /* update ie_length */
pnetwork->ie_length = wps_offset + (wps_ielen+2) + remainder_ielen; pnetwork->ie_length = wps_offset + (wps_ielen + 2) + remainder_ielen;
} }
kfree(pbackup_remainder_ie); kfree(pbackup_remainder_ie);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment