leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8712: r8712_aes_decrypt(): Change return type

Browse Source 
Change return type of r8712_aes_decrypt from u8 to void as its return
value is never checked. Modify return statements accordingly.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190802064212.30476-9-nishkadg.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nishka Dasgupta 2019-08-02 12:12:12 +05:30 committed by Greg Kroah-Hartman
parent eb43590f50
commit b35105a3a3
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/rtl8712/rtl871x_security.c
View File

@ -1341,7 +1341,7 @@ static void aes_decipher(u8 *key, uint hdrlen,
/* compare the mic */ /* compare the mic */
} }
u32 r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe) void r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe)
{ /* exclude ICV */ { /* exclude ICV */
/* Intermediate Buffers */ /* Intermediate Buffers */
sint length; sint length;
@ -1364,7 +1364,7 @@ u32 r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe)
prwskey = &psecuritypriv->XGrpKey[ prwskey = &psecuritypriv->XGrpKey[
((idx >> 6) & 0x3) - 1].skey[0]; ((idx >> 6) & 0x3) - 1].skey[0];
if (!psecuritypriv->binstallGrpkey) if (!psecuritypriv->binstallGrpkey)
return _FAIL; return;
} else { } else {
prwskey = &stainfo->x_UncstKey.skey[0]; prwskey = &stainfo->x_UncstKey.skey[0];
@ -1374,11 +1374,8 @@ u32 r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe)
prxattrib->iv_len; prxattrib->iv_len;
aes_decipher(prwskey, prxattrib->hdrlen, pframe, aes_decipher(prwskey, prxattrib->hdrlen, pframe,
length); length);
} else {
return _FAIL;
} }
} }
return _SUCCESS;
} }
void r8712_use_tkipkey_handler(struct timer_list *t) void r8712_use_tkipkey_handler(struct timer_list *t)

2
drivers/staging/rtl8712/rtl871x_security.h
View File

@ -209,7 +209,7 @@ void r8712_secgetmic(struct mic_data *pmicdata, u8 *dst);
u32 r8712_aes_encrypt(struct _adapter *padapter, u8 *pxmitframe); u32 r8712_aes_encrypt(struct _adapter *padapter, u8 *pxmitframe);
u32 r8712_tkip_encrypt(struct _adapter *padapter, u8 *pxmitframe); u32 r8712_tkip_encrypt(struct _adapter *padapter, u8 *pxmitframe);
void r8712_wep_encrypt(struct _adapter *padapter, u8 *pxmitframe); void r8712_wep_encrypt(struct _adapter *padapter, u8 *pxmitframe);
u32 r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe); void r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe);
void r8712_tkip_decrypt(struct _adapter *padapter, u8 *precvframe); void r8712_tkip_decrypt(struct _adapter *padapter, u8 *precvframe);
void r8712_wep_decrypt(struct _adapter *padapter, u8 *precvframe); void r8712_wep_decrypt(struct _adapter *padapter, u8 *precvframe);
void r8712_use_tkipkey_handler(struct timer_list *t); void r8712_use_tkipkey_handler(struct timer_list *t);