[PATCH] staging: rtl8723bs: core: fix some incorrect type warnings
From: Wan Jiabing
Date: Thu Jun 03 2021 - 04:26:58 EST
Fix some "incorrect type in assignment" in rtw_security.c.
The sparse warings:
drivers/staging//rtl8723bs/core/rtw_security.c:72:50: warning: incorrect type in assignment
drivers/staging//rtl8723bs/core/rtw_security.c:72:50: expected restricted __le32 [usertype]
drivers/staging//rtl8723bs/core/rtw_security.c:72:50: got unsigned int
drivers/staging//rtl8723bs/core/rtw_security.c:80:50: warning: incorrect type in assignment
drivers/staging//rtl8723bs/core/rtw_security.c:80:50: expected restricted __le32 [usertype]
drivers/staging//rtl8723bs/core/rtw_security.c:80:50: got unsigned int
drivers/staging//rtl8723bs/core/rtw_security.c:124:33: warning: cast to restricted __le32
drivers/staging//rtl8723bs/core/rtw_security.c:509:58: warning: incorrect type in assignment
drivers/staging//rtl8723bs/core/rtw_security.c:509:58: expected restricted __le32 [usertype]
drivers/staging//rtl8723bs/core/rtw_security.c:509:58: got unsigned int
drivers/staging//rtl8723bs/core/rtw_security.c:517:58: warning: incorrect type in assignment
drivers/staging//rtl8723bs/core/rtw_security.c:517:58: expected restricted __le32 [usertype]
drivers/staging//rtl8723bs/core/rtw_security.c:517:58: got unsigned int
drivers/staging//rtl8723bs/core/rtw_security.c:621:41: warning: cast to restricted __le32
Signed-off-by: Wan Jiabing <wanjiabing@xxxxxxxx>
---
drivers/staging/rtl8723bs/core/rtw_security.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index a99f439..4760999 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -36,7 +36,7 @@ const char *security_type_str(u8 value)
void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
{ /* exclude ICV */
- unsigned char crc[4];
+ u8 crc[4];
signed int curfragnum, length;
u32 keylength;
@@ -69,7 +69,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
- *((__le32 *)crc) = ~crc32_le(~0, payload, length);
+ *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length));
arc4_setkey(ctx, wepkey, 3 + keylength);
arc4_crypt(ctx, payload, payload, length);
@@ -77,7 +77,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
} else {
length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
- *((__le32 *)crc) = ~crc32_le(~0, payload, length);
+ *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length));
arc4_setkey(ctx, wepkey, 3 + keylength);
arc4_crypt(ctx, payload, payload, length);
arc4_crypt(ctx, payload + length, crc, 4);
@@ -121,7 +121,7 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
arc4_crypt(ctx, payload, payload, length);
/* calculate icv and compare the icv */
- *((u32 *)crc) = le32_to_cpu(~crc32_le(~0, payload, length - 4));
+ *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length - 4));
}
}
@@ -506,7 +506,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
if ((curfragnum+1) == pattrib->nr_frags) { /* 4 the last fragment */
length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
- *((__le32 *)crc) = ~crc32_le(~0, payload, length);
+ *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length));
arc4_setkey(ctx, rc4key, 16);
arc4_crypt(ctx, payload, payload, length);
@@ -514,7 +514,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
} else {
length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
- *((__le32 *)crc) = ~crc32_le(~0, payload, length);
+ *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length));
arc4_setkey(ctx, rc4key, 16);
arc4_crypt(ctx, payload, payload, length);
@@ -618,7 +618,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
arc4_setkey(ctx, rc4key, 16);
arc4_crypt(ctx, payload, payload, length);
- *((u32 *)crc) = le32_to_cpu(~crc32_le(~0, payload, length - 4));
+ *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length - 4));
if (crc[3] != payload[length - 1] || crc[2] != payload[length - 2] ||
crc[1] != payload[length - 3] || crc[0] != payload[length - 4])
--
2.7.4