staging: rtl8188eu: add spaces around operators in rtw_ap.c
PATCH 1/4 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 Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +12 -9
@@ -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[1 ] =0x0 ; -memcpy (&pmlmepriv->htpriv.ht_cap, p+2 , ie_len); +memcpy (&pmlmepriv->htpriv.ht_cap, p +2 , ie_len); }/* parsing HT_INFO_IE */
@@ -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;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 - 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 ) pIE->data[0 ] |=RTW_ERP_INFO_BARKER_PREAMBLE_MODE ;
@@ -1153,12 +1155,13 @@ static void update_bcn_wps_ie(struct adapter *padapter)if (!pwps_ie_src)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 )return ; - wps_offset = (uint)(pwps_ie-ie); + wps_offset = (uint)(pwps_ie - ie); premainder_ie = pwps_ie + wps_ielen;
@@ -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 */ -if ((wps_offset+wps_ielen+2 +remainder_ielen) <=MAX_IE_SZ ) { -memcpy (pwps_ie, pwps_ie_src, wps_ielen+2 ); - pwps_ie += (wps_ielen+2 ); +if ((wps_offset + wps_ielen +2 + remainder_ielen) <=MAX_IE_SZ ) { +memcpy (pwps_ie, pwps_ie_src, wps_ielen +2 ); + pwps_ie += (wps_ielen +2 );if (pbackup_remainder_ie)memcpy (pwps_ie, pbackup_remainder_ie, remainder_ielen);/* 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);
Signature · 1 line
2.21.0
PATCH 2/4 staging: rtl8188eu: replace subtraction with result
Replace subtraction with the result to improve readability and clear missing spaces around '-' checkpatch issues.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +2 -2
@@ -405,10 +405,10 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) psecuritypriv->authenticator_ie[0 ] = (unsigned char )psecnetwork->ie_length; -if ((psecnetwork->ie_length-12 ) < (256 -1 )) +if ((psecnetwork->ie_length-12 ) <255 )memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], psecnetwork->ie_length-12 );else -memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], (256 -1 )); +memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ],255 ); psecnetwork->ie_length =0 ;/* Added by Albert 2009/02/18 */
Signature · 1 line
2.21.0
PATCH 3/4 staging: rtl8188eu: add spaces around '-' in rtw_cmd.c
In reply to Michael StraubeAdd spaces around '-' to follow kernel coding style. Reported by checkpatch.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +2 -2
@@ -405,8 +405,8 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) psecuritypriv->authenticator_ie[0 ] = (unsigned char )psecnetwork->ie_length; -if ((psecnetwork->ie_length-12 ) <255 ) -memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], psecnetwork->ie_length-12 ); +if ((psecnetwork->ie_length -12 ) <255 ) +memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], psecnetwork->ie_length -12 );else memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ],255 );
Signature · 1 line
2.21.0
PATCH 4/4 staging: rtl8188eu: remove unnecessary parentheses
In reply to Michael StraubeRemove unnecessary parentheses to improve readability.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 6 +++--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +3 -3
@@ -1174,15 +1174,15 @@ static void update_bcn_wps_ie(struct adapter *padapter) } 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 ); - pwps_ie += (wps_ielen +2 ); + pwps_ie += wps_ielen +2 ;if (pbackup_remainder_ie)memcpy (pwps_ie, pbackup_remainder_ie, remainder_ielen);/* 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);
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -1
@@ -405,7 +405,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) psecuritypriv->authenticator_ie[0 ] = (unsigned char )psecnetwork->ie_length; -if ((psecnetwork->ie_length -12 ) <255 ) +if (psecnetwork->ie_length -12 <255 )memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ], psecnetwork->ie_length -12 );else memcpy (&psecuritypriv->authenticator_ie[1 ], &psecnetwork->ies[12 ],255 );
Signature · 1 line
2.21.0