Commit b35105a3 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman

staging: rtl8712: r8712_aes_decrypt(): Change return type

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: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190802064212.30476-9-nishkadg.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb43590f
...@@ -1341,7 +1341,7 @@ static void aes_decipher(u8 *key, uint hdrlen, ...@@ -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) ...@@ -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) ...@@ -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)
......
...@@ -209,7 +209,7 @@ void r8712_secgetmic(struct mic_data *pmicdata, u8 *dst); ...@@ -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);
......
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