staging: vt6656: s_uGetRTSCTSRsvTime fix return.
authorMalcolm Priestley <tvboxspy@gmail.com>
Tue, 18 Mar 2014 19:25:08 +0000 (19:25 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Mar 2014 16:00:19 +0000 (09:00 -0700)
Always returns to __le16 type

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/rxtx.c

index 924d9a278fee4f5e62de484486a04f8ead30fe23..3840323858fcc13ffe57901f9272d0d15096ac7a 100644 (file)
@@ -118,7 +118,7 @@ static void s_vSWencryption(struct vnt_private *pDevice,
 static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, u8 byPktType,
        u32 cbFrameLength, u16 wRate, int bNeedAck);
 
-static u16 s_uGetRTSCTSRsvTime(struct vnt_private *priv,
+static __le16 s_uGetRTSCTSRsvTime(struct vnt_private *priv,
        u8 rsv_type, u8 pkt_type, u32 frame_lenght, u16 current_rate);
 
 static u16 s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx,
@@ -367,7 +367,7 @@ static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type,
 }
 
 //byFreqType: 0=>5GHZ 1=>2.4GHZ
-static u16 s_uGetRTSCTSRsvTime(struct vnt_private *priv,
+static __le16 s_uGetRTSCTSRsvTime(struct vnt_private *priv,
        u8 rsv_type, u8 pkt_type, u32 frame_lenght, u16 current_rate)
 {
        u32 rrv_time, rts_time, cts_time, ack_time, data_time;
@@ -402,7 +402,7 @@ static u16 s_uGetRTSCTSRsvTime(struct vnt_private *priv,
 
                rrv_time = cts_time + ack_time + data_time + 2 * priv->uSIFS;
 
-               return rrv_time;
+               return cpu_to_le16((u16)rrv_time);
        }
 
        rrv_time = rts_time + cts_time + ack_time + data_time + 3 * priv->uSIFS;