staging: vt6655: s_vGenerateTxParameter Replace PSTxBufHead with struct vnt_tx_fifo_head
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 1 Apr 2015 21:32:51 +0000 (22:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Apr 2015 13:12:54 +0000 (15:12 +0200)
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>
drivers/staging/vt6655/rxtx.c

index 5b869d1f9e40450998f917fc3cedcc8b016b8ace..195dcc9b471c78dcffb753d50012d15fc388995a 100644 (file)
@@ -116,7 +116,7 @@ void
 s_vGenerateTxParameter(
        struct vnt_private *pDevice,
        unsigned char byPktType,
-       void *pTxBufHead,
+       struct vnt_tx_fifo_head *,
        void *pvRrvTime,
        void *pvRTS,
        void *pvCTS,
@@ -944,7 +944,7 @@ void
 s_vGenerateTxParameter(
        struct vnt_private *pDevice,
        unsigned char byPktType,
-       void *pTxBufHead,
+       struct vnt_tx_fifo_head *tx_buffer_head,
        void *pvRrvTime,
        void *pvRTS,
        void *pvCTS,
@@ -955,21 +955,18 @@ s_vGenerateTxParameter(
        unsigned short wCurrentRate
 )
 {
-       unsigned short wFifoCtl;
+       u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);
        bool bDisCRC = false;
        unsigned char byFBOption = AUTO_FB_NONE;
 
-       PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead;
-
-       pFifoHead->wReserved = wCurrentRate;
-       wFifoCtl = pFifoHead->wFIFOCtl;
+       tx_buffer_head->current_rate = cpu_to_le16(wCurrentRate);
 
-       if (wFifoCtl & FIFOCTL_CRCDIS)
+       if (fifo_ctl & FIFOCTL_CRCDIS)
                bDisCRC = true;
 
-       if (wFifoCtl & FIFOCTL_AUTO_FB_0)
+       if (fifo_ctl & FIFOCTL_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;
 
        if (!pvRrvTime)