staging: rtl8712: changed GetFrameSubType macro

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
index 3400e49c6ce47ab531d4168e02f3630fa24148de..62d56943238fa6eb6b701966f742aa5d3fc41fcb 100644 (file)
--- 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 b8af9656e6da0bf0015c718c7da60d2cfa33c7cd..7ebf247b2affb9089b530e5dd27fc5fc26381ae5 100644 (file)
--- 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)))