diff options
| author | Malcolm Priestley | 2014-03-18 20:25:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-03-19 17:00:19 +0100 |
| commit | 20338015221f6458daf12dd6f666894afcfa9a36 (patch) | |
| tree | e8a173e4e0d81ce7c8a369426efeada452837bff /drivers/staging/vt6656 | |
| parent | staging: vt6656: vnt_rxtx_rsvtime_le16 fix return. (diff) | |
| download | kernel-qcow2-linux-20338015221f6458daf12dd6f666894afcfa9a36.tar.gz kernel-qcow2-linux-20338015221f6458daf12dd6f666894afcfa9a36.tar.xz kernel-qcow2-linux-20338015221f6458daf12dd6f666894afcfa9a36.zip | |
staging: vt6656: s_uGetRTSCTSRsvTime fix return.
Always returns to __le16 type
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 924d9a278fee..3840323858fc 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -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; |