From: Malcolm Priestley <tvboxspy@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-wireless@vger.kernel.org, Malcolm Priestley <tvboxspy@gmail.com>
Subject: [PATCH 14/14] staging: vt6656: s_uGetRTSCTSRsvTime fix return.
Date: Tue, 18 Mar 2014 19:25:08 +0000 [thread overview]
Message-ID: <1395170708-2990-14-git-send-email-tvboxspy@gmail.com> (raw)
In-Reply-To: <1395170708-2990-1-git-send-email-tvboxspy@gmail.com>
Always returns to __le16 type
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
drivers/staging/vt6656/rxtx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 924d9a2..3840323 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;
--
1.9.0
prev parent reply other threads:[~2014-03-18 19:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 19:24 [PATCH 01/14] staging: vt6656: rxtx Replace wDuration* variables Malcolm Priestley
2014-03-18 19:24 ` [PATCH 02/14] staging: vt6656: rxtx: Replace wRTSDuration* variables Malcolm Priestley
2014-03-18 19:24 ` [PATCH 03/14] staging: vt6656: rxtx: Replace wRTSTxRrvTime* Malcolm Priestley
2014-03-18 19:24 ` [PATCH 04/14] staging: vt6656: rxtx: Replace wTxRrvTime* Malcolm Priestley
2014-03-18 19:24 ` [PATCH 05/14] staging: vt6656: rxtx: Replace wCTSDuration* Malcolm Priestley
2014-03-18 19:25 ` [PATCH 06/14] staging: vt6656: rxtx Replace wCTSTxRrvTime_ba Malcolm Priestley
2014-03-18 19:25 ` [PATCH 07/14] staging: vt6656: rxtx Replace wTimeStampOff* variables Malcolm Priestley
2014-03-18 19:25 ` [PATCH 08/14] staging: vt6656: struct vnt_tx_short_buf_head correct base types Malcolm Priestley
2014-03-18 19:25 ` [PATCH 09/14] staging: vt6656: vnt_time_stamp_off fix return to __le16 Malcolm Priestley
2014-03-18 19:25 ` [PATCH 10/14] staging: vt6656: rxtx endian correct return duration Malcolm Priestley
2014-03-18 19:25 ` [PATCH 11/14] staging: vt6656: Correct return type s_uGetRTSCTSDuration Malcolm Priestley
2014-03-18 19:25 ` [PATCH 12/14] staging: vt6656: s_uGetDataDuration use __le16 Malcolm Priestley
2014-03-18 19:25 ` [PATCH 13/14] staging: vt6656: vnt_rxtx_rsvtime_le16 fix return Malcolm Priestley
2014-03-18 19:25 ` Malcolm Priestley [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395170708-2990-14-git-send-email-tvboxspy@gmail.com \
--to=tvboxspy@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).