staging: r8188eu: use proper type for second argiment of rtw_(aes|tkip|wep)_(decrypt|encrypt)
PATCH 1/1 staging: r8188eu: use proper type for second argiment of rtw_(aes|tkip|wep)_(decrypt|encrypt)
rtw_aes_decrypt, rtw_tkip_decrypt, rtw_wep_decrypt, rtw_aes_encrypt, rtw_tkip_encrypt, rtw_wep_encrypt are takes (u8 *) second argiment and always uses it as (struct recv_frame *) or (struct xmit_frame *). This is causes a lot of unnecessary type casts
and complicates refactoring.
Signed-off-by Ivan Safonov <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 6 +-- drivers/staging/rtl8188eu/core/rtw_security.c | 50 +++++++++---------- drivers/staging/rtl8188eu/core/rtw_xmit.c | 6 +-- .../staging/rtl8188eu/include/rtw_security.h | 12 ++--- 5 files changed, 38 insertions(+), 38 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +1 -1
@@ -870,7 +870,7 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta, pattrib->last_txcmdsz = pattrib->pktlen; -rtw_wep_encrypt (padapter, (u8 *)pmgntframe); +rtw_wep_encrypt (padapter, pmgntframe);DBG_88E ("%s\n" , __func__);dump_mgntframe (padapter, pmgntframe); }
drivers/staging/rtl8188eu/core/rtw_recv.c +3 -3
@@ -384,13 +384,13 @@ static struct recv_frame *decryptor(struct adapter *padapter,switch (prxattrib->encrypt) {case _WEP40_:case _WEP104_: - res =rtw_wep_decrypt (padapter, (u8 *)precv_frame); + res =rtw_wep_decrypt (padapter, precv_frame);break ;case _TKIP_: - res =rtw_tkip_decrypt (padapter, (u8 *)precv_frame); + res =rtw_tkip_decrypt (padapter, precv_frame);break ;case _AES_: - res =rtw_aes_decrypt (padapter, (u8 *)precv_frame); + res =rtw_aes_decrypt (padapter, precv_frame);break ;default :break ;
drivers/staging/rtl8188eu/core/rtw_security.c +25 -25
159 lines not on this page · raw message
drivers/staging/rtl8188eu/core/rtw_xmit.c +3 -3
@@ -713,13 +713,13 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmiswitch (pattrib->encrypt) {case _WEP40_:case _WEP104_: -rtw_wep_encrypt (padapter, (u8 *)pxmitframe); +rtw_wep_encrypt (padapter, pxmitframe);break ;case _TKIP_: -rtw_tkip_encrypt (padapter, (u8 *)pxmitframe); +rtw_tkip_encrypt (padapter, pxmitframe);break ;case _AES_: -rtw_aes_encrypt (padapter, (u8 *)pxmitframe); +rtw_aes_encrypt (padapter, pxmitframe);break ;default :break ;
drivers/staging/rtl8188eu/include/rtw_security.h +6 -6
@@ -292,11 +292,11 @@ void rtw_secmicappend(struct mic_data *pmicdata, u8 *src, u32 nBytes);void rtw_secgetmic (struct mic_data *pmicdata,u8 *dst);void rtw_seccalctkipmic (u8 *key,u8 *header,u8 *data,u32 data_len,u8 *Miccode,u8 priority); -u32 rtw_aes_encrypt (struct adapter *padapter,u8 *pxmitframe); -u32 rtw_tkip_encrypt (struct adapter *padapter,u8 *pxmitframe); -void rtw_wep_encrypt (struct adapter *padapter,u8 *pxmitframe); -u32 rtw_aes_decrypt (struct adapter *padapter,u8 *precvframe); -u32 rtw_tkip_decrypt (struct adapter *padapter,u8 *precvframe); -int rtw_wep_decrypt (struct adapter *padapter,u8 *precvframe); +u32 rtw_aes_encrypt (struct adapter *padapter,struct xmit_frame *pxmitframe); +u32 rtw_tkip_encrypt (struct adapter *padapter,struct xmit_frame *pxmitframe); +void rtw_wep_encrypt (struct adapter *padapter,struct xmit_frame *pxmitframe); +u32 rtw_aes_decrypt (struct adapter *padapter,struct recv_frame *precvframe); +u32 rtw_tkip_decrypt (struct adapter *padapter,struct recv_frame *precvframe); +int rtw_wep_decrypt (struct adapter *padapter,struct recv_frame *precvframe);#endif /* __RTL871X_SECURITY_H_ */
Signature · 1 line
2.26.2