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

staging: vt6656: rxtx: move tx_context->fb_option into function structure.

Replace fb_option in function calls with tx_context->fb_option.

Namely functions s_vFillCTSHead and s_vFillRTSHead
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72bf8059
...@@ -545,7 +545,7 @@ static u16 s_vFillRTSHead(struct vnt_usb_send_context *tx_context, u8 byPktType, ...@@ -545,7 +545,7 @@ static u16 s_vFillRTSHead(struct vnt_usb_send_context *tx_context, u8 byPktType,
switch (byPktType) { switch (byPktType) {
case PK_TYPE_11GB: case PK_TYPE_11GB:
case PK_TYPE_11GA: case PK_TYPE_11GA:
if (byFBOption == AUTO_FB_NONE) if (!tx_context->fb_option)
return vnt_rxtx_rts_g_head(tx_context, &head->rts_g, return vnt_rxtx_rts_g_head(tx_context, &head->rts_g,
byPktType, cbFrameLength, byPktType, cbFrameLength,
bNeedAck, wCurrentRate, byFBOption); bNeedAck, wCurrentRate, byFBOption);
...@@ -556,7 +556,7 @@ static u16 s_vFillRTSHead(struct vnt_usb_send_context *tx_context, u8 byPktType, ...@@ -556,7 +556,7 @@ static u16 s_vFillRTSHead(struct vnt_usb_send_context *tx_context, u8 byPktType,
byFBOption); byFBOption);
break; break;
case PK_TYPE_11A: case PK_TYPE_11A:
if (byFBOption) { if (tx_context->fb_option) {
return vnt_rxtx_rts_a_fb_head(tx_context, return vnt_rxtx_rts_a_fb_head(tx_context,
&head->rts_a_fb, byPktType, &head->rts_a_fb, byPktType,
cbFrameLength, bNeedAck, wCurrentRate, cbFrameLength, bNeedAck, wCurrentRate,
...@@ -582,7 +582,7 @@ static u16 s_vFillCTSHead(struct vnt_usb_send_context *tx_context, ...@@ -582,7 +582,7 @@ static u16 s_vFillCTSHead(struct vnt_usb_send_context *tx_context,
if (!head) if (!head)
return 0; return 0;
if (byFBOption != AUTO_FB_NONE) { if (tx_context->fb_option) {
/* Auto Fall back */ /* Auto Fall back */
struct vnt_cts_fb *pBuf = &head->cts_g_fb; struct vnt_cts_fb *pBuf = &head->cts_g_fb;
/* Get SignalField,ServiceField,Length */ /* Get SignalField,ServiceField,Length */
......
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