skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Change "}else{" and variants to "} else {"

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-08-15 13:27:00 -05:00
parent 0a97479cee
commit 16d2a24227
23 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/rtw_cmd.c
View file

@ -1197,7 +1197,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum NDIS_802_11_NETWORK_INFRAST
init_h2fwcmd_w_parm_no_rsp(ph2c, psetop, _SetOpMode_CMD_);
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
}
else{
else {
setopmode_hdl(padapter, (u8 *)psetop);
rtw_mfree((u8 *)psetop, sizeof(*psetop));
}
@ -1232,7 +1232,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool en
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
psetstakey_para->algorithm =(unsigned char) psecuritypriv->dot11PrivacyAlgrthm;
}else{
} else {
GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false);
}
@ -1268,7 +1268,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool en
ph2c->rspsz = sizeof(struct set_stakey_rsp);
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
}
else{
else {
set_stakey_hdl(padapter, (u8 *)psetstakey_para);
rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm));
}
@ -2154,7 +2154,7 @@ u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna, u8 enqueue)
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
}
else{
else {
antenna_select_wk_hdl(padapter, antenna );
}
exit:

6
core/rtw_ioctl_set.c
View file

@ -806,7 +806,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key)
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY:( stainfo!=NULL)&&(Adapter->securitypriv.dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X)\n"));
encryptionalgo =stainfo->dot118021XPrivacy;
}
else{
else {
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: stainfo == NULL)||(Adapter->securitypriv.dot11AuthAlgrthm!=dot11AuthAlgrthm_8021X)\n"));
encryptionalgo =padapter->securitypriv.dot11PrivacyAlgrthm;
}
@ -1114,7 +1114,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key)
res =rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, false, true);
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(group)\n"));
}
else{
else {
res =rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, true, true);
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(unicast)\n"));
}
@ -1168,7 +1168,7 @@ u8 rtw_set_802_11_remove_key(struct adapter* padapter, struct ndis_802_11_remove
memset(&stainfo->dot118021x_UncstKey, 0, 16);
/* \todo Send a H2C Command to Firmware for disable this Key in CAM Entry. */
} else{
} else {
ret = _FAIL;
goto exit;
}

4
core/rtw_mlme.c
View file

@ -2430,7 +2430,7 @@ sint rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv,
psetkeyparm->algorithm =(unsigned char)psecuritypriv->dot118021XGrpPrivacy;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("\n rtw_set_key: psetkeyparm->algorithm =(unsigned char)psecuritypriv->dot118021XGrpPrivacy =%d\n", psetkeyparm->algorithm));
}
else{
else {
psetkeyparm->algorithm =(u8)psecuritypriv->dot11PrivacyAlgrthm;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("\n rtw_set_key: psetkeyparm->algorithm =(u8)psecuritypriv->dot11PrivacyAlgrthm =%d\n", psetkeyparm->algorithm));
@ -2491,7 +2491,7 @@ sint rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv,
res = rtw_enqueue_cmd(pcmdpriv, pcmd);
}
else{
else {
setkey_hdl(adapter, (u8 *)psetkeyparm);
rtw_mfree((u8 *) psetkeyparm, sizeof(struct setkey_parm));
}

8
core/rtw_recv.c
View file

@ -419,7 +419,7 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe) {
goto exit;
}
}
else{
else {
mickey =&stainfo->dot11tkiprxmickey.skey[0];
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic: unicast key\n"));
}
@ -489,7 +489,7 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe) {
res =_FAIL;
}
else{
else {
/* mic checked ok */
if ((psecuritypriv->bcheck_grpkey ==false)&&(IS_MCAST(prxattrib->ra) ==true)) {
psecuritypriv->bcheck_grpkey =true;
@ -594,7 +594,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
return_packet = NULL;
}
else{
else {
prxattrib->bdecrypted = true;
}
return return_packet;
@ -675,7 +675,7 @@ static union recv_frame * portctrl(struct adapter *adapter, union recv_frame * p
prtnframe =precv_frame;
}
else{
else {
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:ether_type =0x%04x\n", ether_type));
}
}

12
core/rtw_security.c
View file

@ -112,7 +112,7 @@ static void crc32_init(void)
;
if (bcrc32initialized == 1)
goto exit;
else{
else {
sint i, j;
u32 c;
u8 *p =(u8 *)&c, *p1;
@ -396,7 +396,7 @@ void rtw_seccalctkipmic(u8 * key, u8 *header, u8 *data, u32 data_len, u8 *mic_co
rtw_secmicappend(&micdata, &header[24], 6);
else
rtw_secmicappend(&micdata, &header[10], 6);
} else{ /* ToDS == 0 */
} else { /* ToDS == 0 */
rtw_secmicappend(&micdata, &header[4], 6); /* DA */
if (header[1]&2) /* From Ds ==1 */
rtw_secmicappend(&micdata, &header[16], 6);
@ -709,7 +709,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
arcfour_encrypt(&mycontext, payload, payload, length);
arcfour_encrypt(&mycontext, payload+length, crc, 4);
} else{
} else {
length =pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len ;
*((__le32 *)crc) =getcrc32(payload, length);/* modified by Amy*/
arcfour_init(&mycontext, rc4key, 16);
@ -724,7 +724,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
}
else{
else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt: stainfo == NULL!!!\n"));
DBG_871X("%s, psta ==NUL\n", __func__);
res =_FAIL;
@ -845,7 +845,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
}
else{
else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_decrypt: stainfo == NULL!!!\n"));
res =_FAIL;
}
@ -1588,7 +1588,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
pframe =(u8*)RND4((SIZE_PTR)(pframe));
}
}
} else{
} else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo == NULL!!!\n"));
DBG_871X("%s, psta ==NUL\n", __func__);
res =_FAIL;

2
core/rtw_wlan_util.c
View file

@ -2107,7 +2107,7 @@ int rtw_handle_dualmac(struct adapter *adapter, bool init)
pbuddy_padapter = NULL;
DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n", __FUNCTION__);
}
}else {
} else {
pbuddy_padapter = NULL;
}
exit:

6
core/rtw_xmit.c
View file

@ -902,7 +902,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
rtw_secmicappend(&micdata, &pframe[24], 6);
else
rtw_secmicappend(&micdata, &pframe[10], 6);
} else{ /* ToDS == 0 */
} else { /* ToDS == 0 */
rtw_secmicappend(&micdata, &pframe[4], 6); /* DA */
if (pframe[1]&2) /* From Ds ==1 */
rtw_secmicappend(&micdata, &pframe[16], 6);
@ -932,7 +932,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
rtw_secmicappend(&micdata, payload, length);
payload =payload+length;
}
else{
else {
length =pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-( (pattrib->bswenc) ? pattrib->icv_len : 0);
rtw_secmicappend(&micdata, payload, length);
payload =payload+length+pattrib->icv_len;
@ -957,7 +957,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
*(payload+curfragnum), *(payload+curfragnum+1), *(payload+curfragnum+2),*(payload+curfragnum+3),
*(payload+curfragnum+4),*(payload+curfragnum+5),*(payload+curfragnum+6),*(payload+curfragnum+7)));
}
else{
else {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: rtw_get_stainfo == NULL!!!\n"));
}
}