evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: vt6656: s_vGenerateTxParameter parse out vnt_rrv_time_ab

Browse source 
create new function vnt_rxtx_ab which will eventually carry onward
functions

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-07-10 19:56:09 +01:00 • committed by Greg Kroah-Hartman
parent f1be5759bc
commit 3b03fea23d
1 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
drivers/staging/vt6656/rxtx.c
View file

@ -669,6 +669,28 @@ static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context,
return 0;
}
static u16 vnt_rxtx_ab(struct vnt_usb_send_context *tx_context,
union vnt_tx_head *tx_head, u8 pkt_type, u32 frame_size,
int need_ack, u16 current_rate, bool need_rts)
{
struct vnt_private *priv = tx_context->priv;
struct vnt_rrv_time_ab *buf = &tx_head->tx_ab.ab;
buf->rrv_time = vnt_rxtx_rsvtime_le16(priv, pkt_type,
frame_size, current_rate, need_ack);
if (need_rts) {
if (pkt_type == PK_TYPE_11B)
buf->rts_rrv_time = s_uGetRTSCTSRsvTime(priv, 0,
pkt_type, frame_size, current_rate);
else /* PK_TYPE_11A */
buf->rts_rrv_time = s_uGetRTSCTSRsvTime(priv, 2,
pkt_type, frame_size, current_rate);
}
return 0;
}
/*+
*
* Description:
@ -696,7 +718,6 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
struct vnt_mic_hdr **mic_hdr, u32 need_mic, u32 cbFrameSize,
int bNeedACK, bool need_rts)
{
struct vnt_private *pDevice = tx_context->priv;
union vnt_tx_data_head *head = NULL;
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
@ -742,26 +763,17 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
}
if (need_rts) {
struct vnt_rrv_time_ab *pBuf = &tx_buffer->
tx_head.tx_ab.ab;
vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, byPktType,
cbFrameSize, bNeedACK, wCurrentRate, need_rts);
pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 2,
byPktType, cbFrameSize, wCurrentRate);
pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
byPktType, cbFrameSize, wCurrentRate, bNeedACK);
/* Fill RTS */
return s_vFillRTSHead(tx_context, byPktType, head,
cbFrameSize, bNeedACK,
wCurrentRate);
} else {
struct vnt_rrv_time_ab *pBuf = &tx_buffer->
tx_head.tx_ab.ab;
pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
byPktType, cbFrameSize,
wCurrentRate, bNeedACK);
vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, byPktType,
cbFrameSize, bNeedACK, wCurrentRate, need_rts);
return vnt_rxtx_datahead_a_fb(tx_context, byPktType,
wCurrentRate, &head->data_head_a_fb,
@ -776,27 +788,16 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
}
if (need_rts) {
struct vnt_rrv_time_ab *pBuf = &tx_buffer->
tx_head.tx_ab.ab;
pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 0,
byPktType, cbFrameSize, wCurrentRate);
pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
byPktType, cbFrameSize, wCurrentRate,
bNeedACK);
vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, byPktType,
cbFrameSize, bNeedACK, wCurrentRate, need_rts);
/* Fill RTS */
return s_vFillRTSHead(tx_context, byPktType, head,
cbFrameSize, bNeedACK,
wCurrentRate);
} else {
struct vnt_rrv_time_ab *pBuf = &tx_buffer->
tx_head.tx_ab.ab;
pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
byPktType, cbFrameSize,
wCurrentRate, bNeedACK);
vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, byPktType,
cbFrameSize, bNeedACK, wCurrentRate, need_rts);
return vnt_rxtx_datahead_ab(tx_context, byPktType,
wCurrentRate, &head->data_head_ab,