From: Malcolm Priestley <tvboxspy@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-wireless@vger.kernel.org, Malcolm Priestley <tvboxspy@gmail.com>
Subject: [PATCH 02/16] staging: vt6656: rxtx: move tx_context->fb_option into function structure.
Date: Thu, 10 Jul 2014 19:56:03 +0100 [thread overview]
Message-ID: <1405018577-6832-2-git-send-email-tvboxspy@gmail.com> (raw)
In-Reply-To: <1405018577-6832-1-git-send-email-tvboxspy@gmail.com>
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>
---
drivers/staging/vt6656/rxtx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 998a62a..a556d81 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 */
--
1.9.1
next prev parent reply other threads:[~2014-07-10 18:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-10 18:56 [PATCH 01/16] staging: vt6656: rxtx remove struct ethhdr from functions Malcolm Priestley
2014-07-10 18:56 ` Malcolm Priestley [this message]
2014-07-10 18:56 ` [PATCH 03/16] staging: vt6656: rxtx remove fb_option " Malcolm Priestley
2014-07-10 18:56 ` [PATCH 04/16] staging: vt6656: move current_rate setting out of s_vGenerateTxParameter Malcolm Priestley
2014-07-10 18:56 ` [PATCH 05/16] staging: vt6656: s_vGenerateTxParameter Parse out struct vnt_rrv_time_rts Malcolm Priestley
2014-07-10 18:56 ` [PATCH 06/16] staging: vt6656: s_vGenerateTxParameter Parse out struct vnt_rrv_time_cts Malcolm Priestley
2014-07-10 18:56 ` [PATCH 07/16] staging: vt6656: s_vGenerateTxParameter rxtx.c s_vGenerateTxParameter pBuf->rrv_time always the calling pkt_type Malcolm Priestley
2014-07-10 18:56 ` [PATCH 08/16] staging: vt6656: s_vGenerateTxParameter parse out vnt_rrv_time_ab Malcolm Priestley
2014-07-10 18:56 ` [PATCH 09/16] staging: vt6656: merge PK_TYPE_11GB and PK_TYPE_11GA into vnt_rxtx_rts Malcolm Priestley
2014-07-10 18:56 ` [PATCH 10/16] staging: vt6656: move s_vFillCTSHead to vnt_rxtx_cts Malcolm Priestley
2014-07-10 18:56 ` [PATCH 11/16] staging: vt6656: merge data positions for packet types a and b into vnt_rxtx_ab Malcolm Priestley
2014-07-10 18:56 ` [PATCH 12/16] staging: vt6656: s_vGenerateTxParameter remove else from if statements Malcolm Priestley
2014-07-10 18:56 ` [PATCH 13/16] staging: vt6656: s_vGenerateTxParameter remove camel case Malcolm Priestley
2014-07-10 18:56 ` [PATCH 14/16] staging: vt6656: rename s_vGenerateTxParameter to vnt_generate_tx_parameter Malcolm Priestley
2014-07-10 18:56 ` [PATCH 15/16] staging: vt6656: s_vFillCTSHead remove camel case Malcolm Priestley
2014-07-10 18:56 ` [PATCH 16/16] staging: vt6656: rename s_vFillCTSHead to vnt_fill_cts_head Malcolm Priestley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405018577-6832-2-git-send-email-tvboxspy@gmail.com \
--to=tvboxspy@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).