From: Malcolm Priestley Date: Thu, 10 Jul 2014 18:56:03 +0000 (+0100) Subject: staging: vt6656: rxtx: move tx_context->fb_option into function structure. X-Git-Tag: firefly_0821_release~176^2~3491^2~963 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ce7b0db87ce0a067742720d123dedfb5ab3cfede;p=firefly-linux-kernel-4.4.55.git 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: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 998a62a47397..a556d818401c 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -545,7 +545,7 @@ static u16 s_vFillRTSHead(struct vnt_usb_send_context *tx_context, u8 byPktType, switch (byPktType) { case PK_TYPE_11GB: 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, byPktType, cbFrameLength, bNeedAck, wCurrentRate, byFBOption); @@ -556,7 +556,7 @@ static u16 s_vFillRTSHead(struct vnt_usb_send_context *tx_context, u8 byPktType, byFBOption); break; case PK_TYPE_11A: - if (byFBOption) { + if (tx_context->fb_option) { return vnt_rxtx_rts_a_fb_head(tx_context, &head->rts_a_fb, byPktType, cbFrameLength, bNeedAck, wCurrentRate, @@ -582,7 +582,7 @@ static u16 s_vFillCTSHead(struct vnt_usb_send_context *tx_context, if (!head) return 0; - if (byFBOption != AUTO_FB_NONE) { + if (tx_context->fb_option) { /* Auto Fall back */ struct vnt_cts_fb *pBuf = &head->cts_g_fb; /* Get SignalField,ServiceField,Length */