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

staging: vt6656: s_vGenerateTxParameter rxtx.c s_vGenerateTxParameter...

staging: vt6656: s_vGenerateTxParameter rxtx.c s_vGenerateTxParameter pBuf->rrv_time always the calling pkt_type

Use byPktType instead of macro.

The pkt_type has already been filtered in this function so its always set
to the correct one.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf9c0118
...@@ -760,7 +760,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context, ...@@ -760,7 +760,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
tx_head.tx_ab.ab; tx_head.tx_ab.ab;
pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
PK_TYPE_11A, cbFrameSize, byPktType, cbFrameSize,
wCurrentRate, bNeedACK); wCurrentRate, bNeedACK);
return vnt_rxtx_datahead_a_fb(tx_context, byPktType, return vnt_rxtx_datahead_a_fb(tx_context, byPktType,
...@@ -783,7 +783,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context, ...@@ -783,7 +783,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
byPktType, cbFrameSize, wCurrentRate); byPktType, cbFrameSize, wCurrentRate);
pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
PK_TYPE_11B, cbFrameSize, wCurrentRate, byPktType, cbFrameSize, wCurrentRate,
bNeedACK); bNeedACK);
/* Fill RTS */ /* Fill RTS */
...@@ -795,7 +795,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context, ...@@ -795,7 +795,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
tx_head.tx_ab.ab; tx_head.tx_ab.ab;
pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
PK_TYPE_11B, cbFrameSize, byPktType, cbFrameSize,
wCurrentRate, bNeedACK); wCurrentRate, bNeedACK);
return vnt_rxtx_datahead_ab(tx_context, byPktType, return vnt_rxtx_datahead_ab(tx_context, byPktType,
......
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