summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656
diff options
context:
space:
mode:
authorHimangi Saraogi2014-03-17 14:58:44 +0100
committerGreg Kroah-Hartman2014-03-18 19:02:28 +0100
commitf4d636ddefcdcde4a574c2c96cf4910c3dd2fb9a (patch)
tree5767efb8c14ec2d987e58279a0656a89c09584c9 /drivers/staging/vt6656
parentstaging:vt6655: Fix sparse warnings of using plain integer as NULL pointer (diff)
downloadkernel-qcow2-linux-f4d636ddefcdcde4a574c2c96cf4910c3dd2fb9a.tar.gz
kernel-qcow2-linux-f4d636ddefcdcde4a574c2c96cf4910c3dd2fb9a.tar.xz
kernel-qcow2-linux-f4d636ddefcdcde4a574c2c96cf4910c3dd2fb9a.zip
staging: vt6656: Fix sparse warnings
This patch fixes the following sparse warnings: drivers/staging/vt6656/aes_ccmp.c:272:32: warning: restricted __le16 degrades to integer drivers/staging/vt6656/aes_ccmp.c:274:32: warning: restricted __le16 degrades to integer drivers/staging/vt6656/aes_ccmp.c:282:32: warning: restricted __le16 degrades to integer Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r--drivers/staging/vt6656/aes_ccmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/aes_ccmp.c b/drivers/staging/vt6656/aes_ccmp.c
index 61b9f7bdb858..e2bfa8d266cd 100644
--- a/drivers/staging/vt6656/aes_ccmp.c
+++ b/drivers/staging/vt6656/aes_ccmp.c
@@ -269,9 +269,9 @@ bool AESbGenCCMP(u8 *pbyRxKey, u8 *pbyFrame, u16 wFrameSize)
/* MIC_HDR1 */
MIC_HDR1[0] = (u8)(wHLen >> 8);
MIC_HDR1[1] = (u8)(wHLen & 0xff);
- byTmp = (u8)(pMACHeader->frame_control & 0xff);
+ byTmp = (u8)(le16_to_cpu(pMACHeader->frame_control) >> 8);
MIC_HDR1[2] = byTmp & 0x8f;
- byTmp = (u8)(pMACHeader->frame_control >> 8);
+ byTmp = (u8)(le16_to_cpu(pMACHeader->frame_control) & 0xff);
byTmp &= 0x87;
MIC_HDR1[3] = byTmp | 0x40;
memcpy(&(MIC_HDR1[4]), pMACHeader->addr1, ETH_ALEN);
@@ -279,7 +279,7 @@ bool AESbGenCCMP(u8 *pbyRxKey, u8 *pbyFrame, u16 wFrameSize)
/* MIC_HDR2 */
memcpy(&(MIC_HDR2[0]), pMACHeader->addr3, ETH_ALEN);
- byTmp = (u8)(pMACHeader->seq_ctrl & 0xff);
+ byTmp = (u8)(le16_to_cpu(pMACHeader->seq_ctrl) >> 8);
MIC_HDR2[6] = byTmp & 0x0f;
MIC_HDR2[7] = 0;