mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-27 22:51:31 +00:00
staging: vt6656: merge PK_TYPE_11GB and PK_TYPE_11GA into vnt_rxtx_rts
add to vnt_rxtx_rts calls from s_vFillRTSHead. add need_mic and union vnt_tx_data_head head positions from s_vGenerateTxParameter. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3b03fea23d
commit
4f06c0dcc7
1 changed files with 15 additions and 26 deletions
|
@ -542,17 +542,6 @@ static u16 s_vFillRTSHead(struct vnt_usb_send_context *tx_context, u8 byPktType,
|
|||
* Otherwise, we need to modified codes for them.
|
||||
*/
|
||||
switch (byPktType) {
|
||||
case PK_TYPE_11GB:
|
||||
case PK_TYPE_11GA:
|
||||
if (!tx_context->fb_option)
|
||||
return vnt_rxtx_rts_g_head(tx_context, &head->rts_g,
|
||||
byPktType, cbFrameLength,
|
||||
bNeedAck, wCurrentRate);
|
||||
else
|
||||
return vnt_rxtx_rts_g_fb_head(tx_context,
|
||||
&head->rts_g_fb, byPktType,
|
||||
cbFrameLength, bNeedAck, wCurrentRate);
|
||||
break;
|
||||
case PK_TYPE_11A:
|
||||
if (tx_context->fb_option) {
|
||||
return vnt_rxtx_rts_a_fb_head(tx_context,
|
||||
|
@ -631,10 +620,11 @@ static u16 s_vFillCTSHead(struct vnt_usb_send_context *tx_context,
|
|||
|
||||
static u16 vnt_rxtx_rts(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)
|
||||
int need_ack, u16 current_rate, bool need_mic)
|
||||
{
|
||||
struct vnt_private *priv = tx_context->priv;
|
||||
struct vnt_rrv_time_rts *buf = &tx_head->tx_rts.rts;
|
||||
union vnt_tx_data_head *head = &tx_head->tx_rts.tx.head;
|
||||
|
||||
buf->rts_rrv_time_aa = s_uGetRTSCTSRsvTime(priv, 2,
|
||||
pkt_type, frame_size, current_rate);
|
||||
|
@ -648,7 +638,15 @@ static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context,
|
|||
buf->rrv_time_b = vnt_rxtx_rsvtime_le16(priv, PK_TYPE_11B, frame_size,
|
||||
priv->byTopCCKBasicRate, need_ack);
|
||||
|
||||
return 0;
|
||||
if (need_mic)
|
||||
head = &tx_head->tx_rts.tx.mic.head;
|
||||
|
||||
if (tx_context->fb_option)
|
||||
return vnt_rxtx_rts_g_fb_head(tx_context, &head->rts_g_fb,
|
||||
pkt_type, frame_size, need_ack, current_rate);
|
||||
|
||||
return vnt_rxtx_rts_g_head(tx_context, &head->rts_g,
|
||||
pkt_type, frame_size, need_ack, current_rate);
|
||||
}
|
||||
|
||||
static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context,
|
||||
|
@ -722,22 +720,13 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
|
|||
|
||||
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
|
||||
if (need_rts) {
|
||||
vnt_rxtx_rts(tx_context, &tx_buffer->tx_head,
|
||||
byPktType, cbFrameSize, bNeedACK, wCurrentRate);
|
||||
|
||||
if (need_mic) {
|
||||
if (need_mic)
|
||||
*mic_hdr = &tx_buffer->
|
||||
tx_head.tx_rts.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_rts.tx.mic.head;
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_rts.tx.head;
|
||||
}
|
||||
|
||||
/* Fill RTS */
|
||||
return s_vFillRTSHead(tx_context, byPktType, head,
|
||||
cbFrameSize, bNeedACK,
|
||||
wCurrentRate);
|
||||
|
||||
return vnt_rxtx_rts(tx_context, &tx_buffer->tx_head,
|
||||
byPktType, cbFrameSize, bNeedACK,
|
||||
wCurrentRate, need_mic);
|
||||
} else {
|
||||
vnt_rxtx_cts(tx_context, &tx_buffer->tx_head,
|
||||
byPktType, cbFrameSize, bNeedACK, wCurrentRate);
|
||||
|
|
Loading…
Reference in a new issue