Skip to content

Commit 01713f0

Browse files
insafonovgregkh
insafonov
authored and
gregkh
committed
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]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8750d02 commit 01713f0

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,
870870

871871
pattrib->last_txcmdsz = pattrib->pktlen;
872872

873-
rtw_wep_encrypt(padapter, (u8 *)pmgntframe);
873+
rtw_wep_encrypt(padapter, pmgntframe);
874874
DBG_88E("%s\n", __func__);
875875
dump_mgntframe(padapter, pmgntframe);
876876
}

‎drivers/staging/rtl8188eu/core/rtw_recv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,13 @@ static struct recv_frame *decryptor(struct adapter *padapter,
384384
switch (prxattrib->encrypt) {
385385
case _WEP40_:
386386
case _WEP104_:
387-
res = rtw_wep_decrypt(padapter, (u8 *)precv_frame);
387+
res = rtw_wep_decrypt(padapter, precv_frame);
388388
break;
389389
case _TKIP_:
390-
res = rtw_tkip_decrypt(padapter, (u8 *)precv_frame);
390+
res = rtw_tkip_decrypt(padapter, precv_frame);
391391
break;
392392
case _AES_:
393-
res = rtw_aes_decrypt(padapter, (u8 *)precv_frame);
393+
res = rtw_aes_decrypt(padapter, precv_frame);
394394
break;
395395
default:
396396
break;

‎drivers/staging/rtl8188eu/core/rtw_security.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -129,29 +129,29 @@ static __le32 getcrc32(u8 *buf, int len)
129129
/*
130130
Need to consider the fragment situation
131131
*/
132-
void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
132+
void rtw_wep_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe)
133133
{
134134
int curfragnum, length;
135135
u8 *pframe;
136136
u8 hw_hdr_offset = 0;
137-
struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
137+
struct pkt_attrib *pattrib = &pxmitframe->attrib;
138138
struct security_priv *psecuritypriv = &padapter->securitypriv;
139139
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
140140
const int keyindex = psecuritypriv->dot11PrivacyKeyIndex;
141141
void *crypto_private;
142142
struct sk_buff *skb;
143143
struct lib80211_crypto_ops *crypto_ops;
144144

145-
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
145+
if (pxmitframe->buf_addr == NULL)
146146
return;
147147

148148
if ((pattrib->encrypt != _WEP40_) && (pattrib->encrypt != _WEP104_))
149149
return;
150150

151151
hw_hdr_offset = TXDESC_SIZE +
152-
(((struct xmit_frame *)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
152+
(pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
153153

154-
pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
154+
pframe = pxmitframe->buf_addr + hw_hdr_offset;
155155

156156
crypto_ops = lib80211_get_crypto_ops("WEP");
157157

@@ -198,13 +198,13 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
198198
crypto_ops->deinit(crypto_private);
199199
}
200200

201-
int rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
201+
int rtw_wep_decrypt(struct adapter *padapter, struct recv_frame *precvframe)
202202
{
203-
struct rx_pkt_attrib *prxattrib = &(((struct recv_frame *)precvframe)->attrib);
203+
struct rx_pkt_attrib *prxattrib = &precvframe->attrib;
204204

205205
if ((prxattrib->encrypt == _WEP40_) || (prxattrib->encrypt == _WEP104_)) {
206206
struct security_priv *psecuritypriv = &padapter->securitypriv;
207-
struct sk_buff *skb = ((struct recv_frame *)precvframe)->pkt;
207+
struct sk_buff *skb = precvframe->pkt;
208208
u8 *pframe = skb->data;
209209
void *crypto_private = NULL;
210210
int status = _SUCCESS;
@@ -572,7 +572,7 @@ static void phase2(u8 *rc4key, const u8 *tk, const u16 *p1k, u16 iv16)
572572
}
573573

574574
/* The hlen isn't include the IV */
575-
u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
575+
u32 rtw_tkip_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe)
576576
{ /* exclude ICV */
577577
u16 pnl;
578578
u32 pnh;
@@ -586,17 +586,17 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
586586
u8 *pframe, *payload, *iv, *prwskey;
587587
union pn48 dot11txpn;
588588
struct sta_info *stainfo;
589-
struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
589+
struct pkt_attrib *pattrib = &pxmitframe->attrib;
590590
struct security_priv *psecuritypriv = &padapter->securitypriv;
591591
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
592592
u32 res = _SUCCESS;
593593

594-
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
594+
if (pxmitframe->buf_addr == NULL)
595595
return _FAIL;
596596

597597
hw_hdr_offset = TXDESC_SIZE +
598-
(((struct xmit_frame *)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
599-
pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
598+
(pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
599+
pframe = pxmitframe->buf_addr + hw_hdr_offset;
600600
/* 4 start to encrypt each fragment */
601601
if (pattrib->encrypt == _TKIP_) {
602602
if (pattrib->psta)
@@ -653,7 +653,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
653653
}
654654

655655
/* The hlen isn't include the IV */
656-
u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
656+
u32 rtw_tkip_decrypt(struct adapter *padapter, struct recv_frame *precvframe)
657657
{ /* exclude ICV */
658658
u16 pnl;
659659
u32 pnh;
@@ -666,12 +666,12 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
666666
u8 *pframe, *payload, *iv, *prwskey;
667667
union pn48 dot11txpn;
668668
struct sta_info *stainfo;
669-
struct rx_pkt_attrib *prxattrib = &((struct recv_frame *)precvframe)->attrib;
669+
struct rx_pkt_attrib *prxattrib = &precvframe->attrib;
670670
struct security_priv *psecuritypriv = &padapter->securitypriv;
671671
u32 res = _SUCCESS;
672672

673673

674-
pframe = (unsigned char *)((struct recv_frame *)precvframe)->pkt->data;
674+
pframe = (unsigned char *)precvframe->pkt->data;
675675

676676
/* 4 start to decrypt recvframe */
677677
if (prxattrib->encrypt == _TKIP_) {
@@ -691,7 +691,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
691691

692692
iv = pframe + prxattrib->hdrlen;
693693
payload = pframe + prxattrib->iv_len + prxattrib->hdrlen;
694-
length = ((struct recv_frame *)precvframe)->pkt->len - prxattrib->hdrlen - prxattrib->iv_len;
694+
length = precvframe->pkt->len - prxattrib->hdrlen - prxattrib->iv_len;
695695

696696
GET_TKIP_PN(iv, dot11txpn);
697697

@@ -1214,7 +1214,7 @@ static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
12141214
return _SUCCESS;
12151215
}
12161216

1217-
u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
1217+
u32 rtw_aes_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe)
12181218
{ /* exclude ICV */
12191219

12201220
/*static*/
@@ -1225,20 +1225,20 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
12251225
u8 *pframe, *prwskey; /* *payload,*iv */
12261226
u8 hw_hdr_offset = 0;
12271227
struct sta_info *stainfo;
1228-
struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
1228+
struct pkt_attrib *pattrib = &pxmitframe->attrib;
12291229
struct security_priv *psecuritypriv = &padapter->securitypriv;
12301230
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
12311231

12321232
/* uint offset = 0; */
12331233
u32 res = _SUCCESS;
12341234

1235-
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
1235+
if (pxmitframe->buf_addr == NULL)
12361236
return _FAIL;
12371237

12381238
hw_hdr_offset = TXDESC_SIZE +
1239-
(((struct xmit_frame *)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
1239+
(pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
12401240

1241-
pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
1241+
pframe = pxmitframe->buf_addr + hw_hdr_offset;
12421242

12431243
/* 4 start to encrypt each fragment */
12441244
if (pattrib->encrypt == _AES_) {
@@ -1276,9 +1276,9 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
12761276
return res;
12771277
}
12781278

1279-
u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
1279+
u32 rtw_aes_decrypt(struct adapter *padapter, struct recv_frame *precvframe)
12801280
{
1281-
struct rx_pkt_attrib *prxattrib = &((struct recv_frame *)precvframe)->attrib;
1281+
struct rx_pkt_attrib *prxattrib = &precvframe->attrib;
12821282
u32 res = _SUCCESS;
12831283

12841284
/* 4 start to encrypt each fragment */
@@ -1288,7 +1288,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
12881288
if (stainfo != NULL) {
12891289
int key_idx;
12901290
const int key_length = 16, iv_len = 8, icv_len = 8;
1291-
struct sk_buff *skb = ((struct recv_frame *)precvframe)->pkt;
1291+
struct sk_buff *skb = precvframe->pkt;
12921292
void *crypto_private = NULL;
12931293
u8 *key, *pframe = skb->data;
12941294
struct lib80211_crypto_ops *crypto_ops = lib80211_get_crypto_ops("CCMP");

‎drivers/staging/rtl8188eu/core/rtw_xmit.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -713,13 +713,13 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
713713
switch (pattrib->encrypt) {
714714
case _WEP40_:
715715
case _WEP104_:
716-
rtw_wep_encrypt(padapter, (u8 *)pxmitframe);
716+
rtw_wep_encrypt(padapter, pxmitframe);
717717
break;
718718
case _TKIP_:
719-
rtw_tkip_encrypt(padapter, (u8 *)pxmitframe);
719+
rtw_tkip_encrypt(padapter, pxmitframe);
720720
break;
721721
case _AES_:
722-
rtw_aes_encrypt(padapter, (u8 *)pxmitframe);
722+
rtw_aes_encrypt(padapter, pxmitframe);
723723
break;
724724
default:
725725
break;

‎drivers/staging/rtl8188eu/include/rtw_security.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,11 @@ void rtw_secmicappend(struct mic_data *pmicdata, u8 *src, u32 nBytes);
292292
void rtw_secgetmic(struct mic_data *pmicdata, u8 *dst);
293293
void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len,
294294
u8 *Miccode, u8 priority);
295-
u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe);
296-
u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe);
297-
void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe);
298-
u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe);
299-
u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe);
300-
int rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe);
295+
u32 rtw_aes_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe);
296+
u32 rtw_tkip_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe);
297+
void rtw_wep_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe);
298+
u32 rtw_aes_decrypt(struct adapter *padapter, struct recv_frame *precvframe);
299+
u32 rtw_tkip_decrypt(struct adapter *padapter, struct recv_frame *precvframe);
300+
int rtw_wep_decrypt(struct adapter *padapter, struct recv_frame *precvframe);
301301

302302
#endif /* __RTL871X_SECURITY_H_ */

0 commit comments

Comments
 (0)