From: Jannik Becher <becher.jannik@gmail.com>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Jannik Becher <becher.jannik@gmail.com>
Subject: [PATCH 05/13] staging: rtl8712: changed GetFrameSubType macro
Date: Tue, 20 Dec 2016 18:59:42 +0100 [thread overview]
Message-ID: <1482256790-14376-6-git-send-email-becher.jannik@gmail.com> (raw)
In-Reply-To: <1482256790-14376-1-git-send-email-becher.jannik@gmail.com>
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
next prev parent reply other threads:[~2016-12-20 18:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-20 17:59 [PATCH 00/13] staging: rtl8712: Fixed sparse warnings Jannik Becher
2016-12-20 17:59 ` [PATCH 01/13] staging: rtl8712: changed struct members to __le32 Jannik Becher
2016-12-20 17:59 ` [PATCH 02/13] staging: rtl8712: changed variables " Jannik Becher
2016-12-20 17:59 ` [PATCH 03/13] staging: rtl8712: changed function argument " Jannik Becher
2016-12-20 17:59 ` [PATCH 04/13] staging: rtl8712: casted variables " Jannik Becher
2016-12-20 17:59 ` Jannik Becher [this message]
2016-12-20 17:59 ` [PATCH 06/13] staging: rtl8712: changed typecast to __le Jannik Becher
2016-12-20 17:59 ` [PATCH 07/13] staging: rtl8712: changed u32 to __le32 Jannik Becher
2016-12-20 17:59 ` [PATCH 08/13] staging: rtl8712: changed uint " Jannik Becher
2016-12-20 17:59 ` [PATCH 09/13] staging: rtl8712: fixed little endian problem Jannik Becher
2016-12-20 17:59 ` [PATCH 10/13] staging: rtl8712: changed u32 to __le32 Jannik Becher
2016-12-20 17:59 ` [PATCH 11/13] staging: rtl8712: changed cast to __le16 Jannik Becher
2016-12-20 17:59 ` [PATCH 12/13] staging: rtl8712: changed u16 to __be16 Jannik Becher
2016-12-20 17:59 ` [PATCH 13/13] staging: rtl8712: used a better macro Jannik Becher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1482256790-14376-6-git-send-email-becher.jannik@gmail.com \
--to=becher.jannik@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).