evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: vt6655: Fix *Duration s_uFillDataHead to return to __le16

Browse source 
All callers should be __le16.

Fix vGenerateMACHeader duration to __le16 and reverse the endian
conversion.

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-08-30 22:25:38 +01:00 • committed by Greg Kroah-Hartman
parent 9c62c7abf8
commit a479ffc388
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/staging/vt6655/rxtx.c
View file

@ -166,7 +166,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
unsigned int uNodeIndex, unsigned int *puMACfragNum); unsigned int uNodeIndex, unsigned int *puMACfragNum);
static static
unsigned int __le16
s_uFillDataHead( s_uFillDataHead(
struct vnt_private *pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
@ -671,7 +671,7 @@ s_uGetRTSCTSDuration(
} }
static static
unsigned int __le16
s_uFillDataHead( s_uFillDataHead(
struct vnt_private *pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
@ -1202,7 +1202,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
unsigned char *pbyIVHead; unsigned char *pbyIVHead;
unsigned char *pbyMacHdr; unsigned char *pbyMacHdr;
unsigned short wFragType; //00:Non-Frag, 01:Start, 10:Mid, 11:Last unsigned short wFragType; //00:Non-Frag, 01:Start, 10:Mid, 11:Last
unsigned int uDuration; __le16 uDuration;
unsigned char *pbyBuffer; unsigned char *pbyBuffer;
unsigned int cbIVlen = 0; unsigned int cbIVlen = 0;
unsigned int cbICVlen = 0; unsigned int cbICVlen = 0;
@ -1448,7 +1448,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK, uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK,
uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate);
// Generate TX MAC Header // Generate TX MAC Header
vGenerateMACHeader(pDevice, pbyMacHdr, (unsigned short)uDuration, psEthHeader, bNeedEncrypt, vGenerateMACHeader(pDevice, pbyMacHdr, uDuration, psEthHeader, bNeedEncrypt,
wFragType, uDMAIdx, uFragIdx); wFragType, uDMAIdx, uFragIdx);
if (bNeedEncrypt == true) { if (bNeedEncrypt == true) {
@ -1539,7 +1539,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate);
// Generate TX MAC Header // Generate TX MAC Header
vGenerateMACHeader(pDevice, pbyMacHdr, (unsigned short)uDuration, psEthHeader, bNeedEncrypt, vGenerateMACHeader(pDevice, pbyMacHdr, uDuration, psEthHeader, bNeedEncrypt,
wFragType, uDMAIdx, uFragIdx); wFragType, uDMAIdx, uFragIdx);
if (bNeedEncrypt == true) { if (bNeedEncrypt == true) {
@ -1657,7 +1657,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate);
// Generate TX MAC Header // Generate TX MAC Header
vGenerateMACHeader(pDevice, pbyMacHdr, (unsigned short)uDuration, psEthHeader, bNeedEncrypt, vGenerateMACHeader(pDevice, pbyMacHdr, uDuration, psEthHeader, bNeedEncrypt,
wFragType, uDMAIdx, uFragIdx); wFragType, uDMAIdx, uFragIdx);
if (bNeedEncrypt == true) { if (bNeedEncrypt == true) {
@ -1765,7 +1765,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
0, 0, uMACfragNum, byFBOption, pDevice->wCurrentRate); 0, 0, uMACfragNum, byFBOption, pDevice->wCurrentRate);
// Generate TX MAC Header // Generate TX MAC Header
vGenerateMACHeader(pDevice, pbyMacHdr, (unsigned short)uDuration, psEthHeader, bNeedEncrypt, vGenerateMACHeader(pDevice, pbyMacHdr, uDuration, psEthHeader, bNeedEncrypt,
wFragType, uDMAIdx, 0); wFragType, uDMAIdx, 0);
if (bNeedEncrypt == true) { if (bNeedEncrypt == true) {
@ -1989,7 +1989,7 @@ void
vGenerateMACHeader( vGenerateMACHeader(
struct vnt_private *pDevice, struct vnt_private *pDevice,
unsigned char *pbyBufferAddr, unsigned char *pbyBufferAddr,
unsigned short wDuration, __le16 wDuration,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
bool bNeedEncrypt, bool bNeedEncrypt,
unsigned short wFragType, unsigned short wFragType,
@ -2027,7 +2027,7 @@ vGenerateMACHeader(
if (bNeedEncrypt) if (bNeedEncrypt)
pMACHeader->wFrameCtl |= cpu_to_le16((unsigned short)WLAN_SET_FC_ISWEP(1)); pMACHeader->wFrameCtl |= cpu_to_le16((unsigned short)WLAN_SET_FC_ISWEP(1));
pMACHeader->wDurationID = cpu_to_le16(wDuration); pMACHeader->wDurationID = le16_to_cpu(wDuration);
if (pDevice->bLongHeader) { if (pDevice->bLongHeader) {
PWLAN_80211HDR_A4 pMACA4Header = (PWLAN_80211HDR_A4) pbyBufferAddr; PWLAN_80211HDR_A4 pMACA4Header = (PWLAN_80211HDR_A4) pbyBufferAddr;