staging: vt6656: rxtx.c s_uGetDataDuration return endian corrected u16.

The return always be u16 endian corrected. For the
large part this is missing.

Fix uGetDataDuration to return u16 endian corrected.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 05e82ece1f3022d7d341a0475a59d3d8bbe43b79..1d0611ee7e0a25b4d9a6cedce9daafc13ddb5c39 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -132,7 +132,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
        void *pvRTS, u32 cbFrameLength, int bNeedAck, int bDisCRC,
        struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption);
 
-static u32 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType,
+static u16 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType,
        u8 byPktType, int bNeedAck);
 
 static u16 s_uGetRTSCTSDuration(struct vnt_private *pDevice,
@@ -383,7 +383,7 @@ static u32 s_uGetRTSCTSRsvTime(struct vnt_private *pDevice,
 }
 
 //byFreqType 0: 5GHz, 1:2.4Ghz
-static u32 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType,
+static u16 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType,
        u8 byPktType, int bNeedAck)
 {
        u32 uAckTime = 0;
@@ -395,7 +395,7 @@ static u32 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType,
                else
                        uAckTime = BBuGetFrameTime(pDevice->byPreambleType,
                                byPktType, 14, pDevice->byTopOFDMBasicRate);
-               return pDevice->uSIFS + uAckTime;
+               return cpu_to_le16((u16)(pDevice->uSIFS + uAckTime));
        }
 
        return 0;
@@ -507,9 +507,9 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
                BBvCalculateParameter(pDevice, cbFrameLength,
                        pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b);
                 //Get Duration and TimeStamp
-               pBuf->wDuration_a = (u16)s_uGetDataDuration(pDevice, DATADUR_A,
+               pBuf->wDuration_a = s_uGetDataDuration(pDevice, DATADUR_A,
                                                        byPktType, bNeedAck);
-               pBuf->wDuration_b = (u16)s_uGetDataDuration(pDevice, DATADUR_B,
+               pBuf->wDuration_b = s_uGetDataDuration(pDevice, DATADUR_B,
                                                        PK_TYPE_11B, bNeedAck);
 
                 pBuf->wTimeStampOff_a = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
@@ -525,13 +525,13 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
                BBvCalculateParameter(pDevice, cbFrameLength,
                        pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b);
                 //Get Duration and TimeStamp
-               pBuf->wDuration_a = (u16)s_uGetDataDuration(pDevice, DATADUR_A,
+               pBuf->wDuration_a = s_uGetDataDuration(pDevice, DATADUR_A,
                                                        byPktType, bNeedAck);
-               pBuf->wDuration_b = (u16)s_uGetDataDuration(pDevice, DATADUR_B,
+               pBuf->wDuration_b = s_uGetDataDuration(pDevice, DATADUR_B,
                                                        PK_TYPE_11B, bNeedAck);
-               pBuf->wDuration_a_f0 = (u16)s_uGetDataDuration(pDevice,
+               pBuf->wDuration_a_f0 = s_uGetDataDuration(pDevice,
                                        DATADUR_A_F0, byPktType, bNeedAck);
-               pBuf->wDuration_a_f1 = (u16)s_uGetDataDuration(pDevice,
+               pBuf->wDuration_a_f1 = s_uGetDataDuration(pDevice,
                                        DATADUR_A_F1, byPktType, bNeedAck);
                 pBuf->wTimeStampOff_a = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
                 pBuf->wTimeStampOff_b = wTimeStampOff[pDevice->byPreambleType%2][pDevice->byTopCCKBasicRate%MAX_RATE];
@@ -546,11 +546,11 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
                BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate,
                        byPktType, &pBuf->a);
             //Get Duration and TimeStampOff
-               pBuf->wDuration = (u16)s_uGetDataDuration(pDevice, DATADUR_A,
+               pBuf->wDuration = s_uGetDataDuration(pDevice, DATADUR_A,
                                        byPktType, bNeedAck);
-               pBuf->wDuration_f0 = (u16)s_uGetDataDuration(pDevice,
+               pBuf->wDuration_f0 = s_uGetDataDuration(pDevice,
                                DATADUR_A_F0, byPktType, bNeedAck);
-               pBuf->wDuration_f1 = (u16)s_uGetDataDuration(pDevice,
+               pBuf->wDuration_f1 = s_uGetDataDuration(pDevice,
                                DATADUR_A_F1, byPktType, bNeedAck);
                 pBuf->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
             return (pBuf->wDuration);
@@ -561,7 +561,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
                BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate,
                        byPktType, &pBuf->ab);
             //Get Duration and TimeStampOff
-               pBuf->wDuration = (u16)s_uGetDataDuration(pDevice, DATADUR_A,
+               pBuf->wDuration = s_uGetDataDuration(pDevice, DATADUR_A,
                                byPktType, bNeedAck);
                 pBuf->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
 
@@ -575,7 +575,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
                BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate,
                        byPktType, &pBuf->ab);
             //Get Duration and TimeStampOff
-               pBuf->wDuration = (u16)s_uGetDataDuration(pDevice, DATADUR_B,
+               pBuf->wDuration = s_uGetDataDuration(pDevice, DATADUR_B,
                                byPktType, bNeedAck);
                 pBuf->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
 
@@ -1805,8 +1805,8 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
        BBvCalculateParameter(pDevice, cbFrameSize, wCurrentRate, PK_TYPE_11A,
                                                        &pTxDataHead->ab);
         //Get Duration and TimeStampOff
-       pTxDataHead->wDuration = cpu_to_le16((u16)s_uGetDataDuration(pDevice,
-                               DATADUR_A, PK_TYPE_11A, false));
+       pTxDataHead->wDuration = s_uGetDataDuration(pDevice,
+                                       DATADUR_A, PK_TYPE_11A, false);
         pTxDataHead->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
        cbHeaderSize = wTxBufSize + sizeof(struct vnt_tx_datahead_ab);
     } else {
@@ -1818,8 +1818,8 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
        BBvCalculateParameter(pDevice, cbFrameSize, wCurrentRate, PK_TYPE_11B,
                                                        &pTxDataHead->ab);
         //Get Duration and TimeStampOff
-       pTxDataHead->wDuration = cpu_to_le16((u16)s_uGetDataDuration(pDevice,
-                               DATADUR_B, PK_TYPE_11B, false));
+       pTxDataHead->wDuration = s_uGetDataDuration(pDevice,
+                                       DATADUR_B, PK_TYPE_11B, false);
         pTxDataHead->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
        cbHeaderSize = wTxBufSize + sizeof(struct vnt_tx_datahead_ab);
     }