Commit aadf7d13 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: rename s_uGetRTSCTSRsvTime to vnt_get_rtscts_rsvtime_le

Function always returns little endian.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 435ae3be
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
* vnt_get_duration_le - get tx data required duration * vnt_get_duration_le - get tx data required duration
* s_uFillDataHead- fulfill tx data duration header * s_uFillDataHead- fulfill tx data duration header
* vnt_get_rtscts_duration_le- get rtx/cts required duration * vnt_get_rtscts_duration_le- get rtx/cts required duration
* s_uGetRTSCTSRsvTime- get rts/cts reserved time * vnt_get_rtscts_rsvtime_le- get rts/cts reserved time
* s_uGetTxRsvTime- get frame reserved time * s_uGetTxRsvTime- get frame reserved time
* vnt_fill_cts_head- fulfill CTS ctl header * vnt_fill_cts_head- fulfill CTS ctl header
* s_vFillFragParameter- Set fragment ctl parameter. * s_vFillFragParameter- Set fragment ctl parameter.
...@@ -86,7 +86,7 @@ static struct vnt_usb_send_context *s_vGetFreeContext(struct vnt_private *); ...@@ -86,7 +86,7 @@ static struct vnt_usb_send_context *s_vGetFreeContext(struct vnt_private *);
static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, u8 byPktType, static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, u8 byPktType,
u32 cbFrameLength, u16 wRate, int bNeedAck); u32 cbFrameLength, u16 wRate, int bNeedAck);
static __le16 s_uGetRTSCTSRsvTime(struct vnt_private *priv, static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
u8 rsv_type, u8 pkt_type, u32 frame_length, u16 current_rate); u8 rsv_type, u8 pkt_type, u32 frame_length, u16 current_rate);
static __le16 vnt_get_duration_le(struct vnt_private *pDevice, static __le16 vnt_get_duration_le(struct vnt_private *pDevice,
...@@ -166,7 +166,7 @@ static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type, ...@@ -166,7 +166,7 @@ static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type,
} }
//byFreqType: 0=>5GHZ 1=>2.4GHZ //byFreqType: 0=>5GHZ 1=>2.4GHZ
static __le16 s_uGetRTSCTSRsvTime(struct vnt_private *priv, static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
u8 rsv_type, u8 pkt_type, u32 frame_length, u16 current_rate) u8 rsv_type, u8 pkt_type, u32 frame_length, u16 current_rate)
{ {
u32 rrv_time, rts_time, cts_time, ack_time, data_time; u32 rrv_time, rts_time, cts_time, ack_time, data_time;
...@@ -584,11 +584,11 @@ static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, ...@@ -584,11 +584,11 @@ static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context,
struct vnt_rrv_time_rts *buf = &tx_head->tx_rts.rts; struct vnt_rrv_time_rts *buf = &tx_head->tx_rts.rts;
union vnt_tx_data_head *head = &tx_head->tx_rts.tx.head; union vnt_tx_data_head *head = &tx_head->tx_rts.tx.head;
buf->rts_rrv_time_aa = s_uGetRTSCTSRsvTime(priv, 2, buf->rts_rrv_time_aa = vnt_get_rtscts_rsvtime_le(priv, 2,
pkt_type, frame_size, current_rate); pkt_type, frame_size, current_rate);
buf->rts_rrv_time_ba = s_uGetRTSCTSRsvTime(priv, 1, buf->rts_rrv_time_ba = vnt_get_rtscts_rsvtime_le(priv, 1,
pkt_type, frame_size, current_rate); pkt_type, frame_size, current_rate);
buf->rts_rrv_time_bb = s_uGetRTSCTSRsvTime(priv, 0, buf->rts_rrv_time_bb = vnt_get_rtscts_rsvtime_le(priv, 0,
pkt_type, frame_size, current_rate); pkt_type, frame_size, current_rate);
buf->rrv_time_a = vnt_rxtx_rsvtime_le16(priv, pkt_type, frame_size, buf->rrv_time_a = vnt_rxtx_rsvtime_le16(priv, pkt_type, frame_size,
...@@ -621,7 +621,7 @@ static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context, ...@@ -621,7 +621,7 @@ static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context,
buf->rrv_time_b = vnt_rxtx_rsvtime_le16(priv, PK_TYPE_11B, buf->rrv_time_b = vnt_rxtx_rsvtime_le16(priv, PK_TYPE_11B,
frame_size, priv->byTopCCKBasicRate, need_ack); frame_size, priv->byTopCCKBasicRate, need_ack);
buf->cts_rrv_time_ba = s_uGetRTSCTSRsvTime(priv, 3, buf->cts_rrv_time_ba = vnt_get_rtscts_rsvtime_le(priv, 3,
pkt_type, frame_size, current_rate); pkt_type, frame_size, current_rate);
if (need_mic) if (need_mic)
...@@ -648,10 +648,10 @@ static u16 vnt_rxtx_ab(struct vnt_usb_send_context *tx_context, ...@@ -648,10 +648,10 @@ static u16 vnt_rxtx_ab(struct vnt_usb_send_context *tx_context,
if (need_rts) { if (need_rts) {
if (pkt_type == PK_TYPE_11B) if (pkt_type == PK_TYPE_11B)
buf->rts_rrv_time = s_uGetRTSCTSRsvTime(priv, 0, buf->rts_rrv_time = vnt_get_rtscts_rsvtime_le(priv, 0,
pkt_type, frame_size, current_rate); pkt_type, frame_size, current_rate);
else /* PK_TYPE_11A */ else /* PK_TYPE_11A */
buf->rts_rrv_time = s_uGetRTSCTSRsvTime(priv, 2, buf->rts_rrv_time = vnt_get_rtscts_rsvtime_le(priv, 2,
pkt_type, frame_size, current_rate); pkt_type, frame_size, current_rate);
if (tx_context->fb_option && pkt_type == PK_TYPE_11A) if (tx_context->fb_option && pkt_type == PK_TYPE_11A)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment