]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: vt6656: rxtx: move tx_context->fb_option into function structure.
authorMalcolm Priestley <tvboxspy@gmail.com>
Thu, 10 Jul 2014 18:56:03 +0000 (19:56 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Jul 2014 22:17:14 +0000 (15:17 -0700)
Replace fb_option in function calls with tx_context->fb_option.

Namely functions s_vFillCTSHead and s_vFillRTSHead

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/rxtx.c

index 998a62a47397e8eb2cf5278dbd529492bebfd5f9..a556d818401c1c8b186150ca14ea54008cf7d61c 100644 (file)
@@ -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 */