mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-27 22:51:31 +00:00
Code Issues Releases Wiki Activity

staging: vt6656: WCTLbIsDuplicate fix PSCacheEntry base types and warnings

Browse source 
Fix wFmSequence and wFrameCtl to __le16

Don't restrict to u8, if packet is a duplicate both bytes of __le16 will be
the same.

Fixes warnings
wctl.c:66:9: warning: restricted __le16 degrades to integer
wctl.c:71:56: warning: restricted __le16 degrades to integer
wctl.c:73:49: warning: cast from restricted __le16
wctl.c:83:30: warning: incorrect type in assignment (different base types)
wctl.c:83:30:    expected unsigned short [unsigned] [usertype] wFmSequence
wctl.c:83:30:    got restricted __le16 [usertype] seq_ctrl
wctl.c:85:28: warning: incorrect type in assignment (different base types)
wctl.c:85:28:    expected unsigned short [unsigned] [usertype] wFrameCtl
wctl.c:85:28:    got restricted __le16 [usertype] frame_control

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-05-27 21:05:17 +01:00 committed by Greg Kroah-Hartman
parent 8b9c012a42
commit 9046db518e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/vt6656/device.h
View file

@ -340,9 +340,9 @@ typedef struct tagSPMKIDCandidateEvent {
/* The receive duplicate detection cache entry */
typedef struct tagSCacheEntry{
u16 wFmSequence;
u8 abyAddr2[ETH_ALEN];
u16 wFrameCtl;
__le16 wFmSequence;
u8 abyAddr2[ETH_ALEN];
__le16 wFrameCtl;
} SCacheEntry, *PSCacheEntry;
typedef struct tagSCache{

2
drivers/staging/vt6656/wctl.c
View file

@ -70,7 +70,7 @@ bool WCTLbIsDuplicate (PSCache pCache, struct ieee80211_hdr *pMACHeader)
pCacheEntry = &(pCache->asCacheEntry[uIndex]);
if ((pCacheEntry->wFmSequence == pMACHeader->seq_ctrl) &&
ether_addr_equal(pCacheEntry->abyAddr2, pMACHeader->addr2) &&
(LOBYTE(pCacheEntry->wFrameCtl) == LOBYTE(pMACHeader->frame_control))
(pCacheEntry->wFrameCtl == pMACHeader->frame_control)
) {
/* Duplicate match */
return true;