Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1545347
| From | Jannik Becher <becher.jannik@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 05/13] staging: rtl8712: changed GetFrameSubType macro |
| Date | 2016-12-20 19:10 +0100 |
| Message-ID | <sQx1p-ys-51@gated-at.bofh.it> (permalink) |
| References | <sQx1o-ys-13@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Fixed a sparse warning.
GetFrameSubType and GetFrameType should cast to __le16. Furthermore
GetFramSubType should use le16_to_cpu instead of cpu_to_le16.
Signed-off-by: Jannik Becher <becher.jannik@gmail.com>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
---
drivers/staging/rtl8712/rtl871x_security.c | 4 ++--
drivers/staging/rtl8712/wifi.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
index 3400e49..62d5694 100644
--- a/drivers/staging/rtl8712/rtl871x_security.c
+++ b/drivers/staging/rtl8712/rtl871x_security.c
@@ -1047,8 +1047,8 @@ static sint aes_cipher(u8 *key, uint hdrlen,
u8 aes_out[16];
u8 padded_buffer[16];
u8 mic[8];
- uint frtype = GetFrameType(pframe);
- uint frsubtype = GetFrameSubType(pframe);
+ u16 frtype = GetFrameType(pframe);
+ u16 frsubtype = GetFrameSubType(pframe);
frsubtype >>= 4;
memset((void *)mic_iv, 0, 16);
diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h
index b8af965..7ebf247 100644
--- a/drivers/staging/rtl8712/wifi.h
+++ b/drivers/staging/rtl8712/wifi.h
@@ -229,7 +229,7 @@ enum WIFI_REG_DOMAIN {
#define GetOrder(pbuf) (((*(unsigned short *)(pbuf)) & \
le16_to_cpu(_ORDER_)) != 0)
-#define GetFrameType(pbuf) (le16_to_cpu(*(unsigned short *)(pbuf)) & \
+#define GetFrameType(pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & \
(BIT(3) | BIT(2)))
#define SetFrameType(pbuf, type) \
@@ -239,7 +239,7 @@ enum WIFI_REG_DOMAIN {
*(unsigned short *)(pbuf) |= cpu_to_le16(type); \
} while (0)
-#define GetFrameSubType(pbuf) (cpu_to_le16(*(unsigned short *)(pbuf)) & \
+#define GetFrameSubType(pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & \
(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | \
BIT(2)))
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/13] staging: rtl8712: Fixed sparse warnings Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 01/13] staging: rtl8712: changed struct members to __le32 Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 12/13] staging: rtl8712: changed u16 to __be16 Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 11/13] staging: rtl8712: changed cast to __le16 Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 04/13] staging: rtl8712: casted variables to __le32 Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 10/13] staging: rtl8712: changed u32 to __le32 Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 13/13] staging: rtl8712: used a better macro Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 03/13] staging: rtl8712: changed function argument to __le32 Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 08/13] staging: rtl8712: changed uint to __le32 Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 09/13] staging: rtl8712: fixed little endian problem Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 05/13] staging: rtl8712: changed GetFrameSubType macro Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 02/13] staging: rtl8712: changed variables to __le32 Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100 [PATCH 06/13] staging: rtl8712: changed typecast to __le Jannik Becher <becher.jannik@gmail.com> - 2016-12-20 19:10 +0100
csiph-web