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

staging: vt6655: s_vGenerateTxParameter Replace PSTxBufHead with struct vnt_tx_fifo_head

Browse source 
With endian correction on fifo_ctl and current_rate.

Removing pTxBufHead, pFifoHead and wFifoCtl

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2015-04-01 22:32:51 +01:00 • committed by Greg Kroah-Hartman
parent d049c7f819
commit df18480650
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ void
s_vGenerateTxParameter( s_vGenerateTxParameter(
struct vnt_private *pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
void *pTxBufHead, struct vnt_tx_fifo_head *,
void *pvRrvTime, void *pvRrvTime,
void *pvRTS, void *pvRTS,
void *pvCTS, void *pvCTS,
@ -944,7 +944,7 @@ void
s_vGenerateTxParameter( s_vGenerateTxParameter(
struct vnt_private *pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
void *pTxBufHead, struct vnt_tx_fifo_head *tx_buffer_head,
void *pvRrvTime, void *pvRrvTime,
void *pvRTS, void *pvRTS,
void *pvCTS, void *pvCTS,
@ -955,21 +955,18 @@ s_vGenerateTxParameter(
unsigned short wCurrentRate unsigned short wCurrentRate
) )
{ {
unsigned short wFifoCtl; u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);
bool bDisCRC = false; bool bDisCRC = false;
unsigned char byFBOption = AUTO_FB_NONE; unsigned char byFBOption = AUTO_FB_NONE;
PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead; tx_buffer_head->current_rate = cpu_to_le16(wCurrentRate);
pFifoHead->wReserved = wCurrentRate; if (fifo_ctl & FIFOCTL_CRCDIS)
wFifoCtl = pFifoHead->wFIFOCtl;
if (wFifoCtl & FIFOCTL_CRCDIS)
bDisCRC = true; bDisCRC = true;
if (wFifoCtl & FIFOCTL_AUTO_FB_0) if (fifo_ctl & FIFOCTL_AUTO_FB_0)
byFBOption = AUTO_FB_0; byFBOption = AUTO_FB_0;
else if (wFifoCtl & FIFOCTL_AUTO_FB_1) else if (fifo_ctl & FIFOCTL_AUTO_FB_1)
byFBOption = AUTO_FB_1; byFBOption = AUTO_FB_1;
if (!pvRrvTime) if (!pvRrvTime)