| Message ID | 03dd39114b1e5c029cd8022245403a079ff03ae7.1666347511.git.tanjubrunostar0@gmail.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp621917wrr;
Fri, 21 Oct 2022 03:42:17 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM61UHUYd8+IY2XlL2/0R3nicbU1pnQDCKl0sg458hiPaa7Rpgo/4v6us8/yHsFetZov04sO
X-Received: by 2002:a05:6402:2035:b0:461:5ccf:9875 with SMTP id
ay21-20020a056402203500b004615ccf9875mr257237edb.264.1666348937820;
Fri, 21 Oct 2022 03:42:17 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1666348937; cv=none;
d=google.com; s=arc-20160816;
b=twKLvO4MbcWv8vc3G6x6SD/AiP6uuUiLCVDB4vkbXc3qV3Othph6obKuupK7DlYHLm
LvzdFjjmpkqI9BFseM7+Phr9WjwVXVNzGGMY/V6weHXyxPFoQwipbh5yb/JfcJNk2FUe
dIDvlNJOfX2wFO7ne03UOpD6ONHXrckgODWpJszQiDg8dfWaDhtF4HMTm7kyCFKHhFAz
fhpPQ5xPcgtLzj/aB0tTwHci0IFaiJPU7MjN+Cn7sMjOOtbmydaZLD1YL6GT3wlso3eq
S3zBUCMFNRsUjD8Gf1obEy4nVBZJ2tS+X993mlDa8nSlElFbBm1RfbQqZXfyWSMH9J1a
iAww==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from
:dkim-signature;
bh=s10DD2bi79V+xICsKZzl2wJQlQcRDXrwKveFEEfHFNU=;
b=M76oROdQXsKEVJf+lFl9h+t3rSdym2e5ZXwaN1A9XSw6UpLH+vo95j3LGRWOdfWqr4
Sc79dmD7zV2zIN3Cyi0TuS8NaQoQjuoAVTld1Ea7iZkMdiwsbPH98+Z3BMuvCcM2v4kV
Ci4vm9vCZIk5yfOCVheQI8uZJLlTTMq4iIv8Mnxym56uPMX5ZiN7ojip285MBkWmACDn
SRnC8AL4JsdB86d9/L1Lw9ajsnMCKozb95Ii42fohdzB8weNTOGxjZ8FoZIXjwN/3maS
jEk1JIbiHL0cdOYEJqmLaSFq5LBWxF5D92ryAvG09x1WNvGVBnBtTYKucGp8ZV9rXQ5w
UcjA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@gmail.com header.s=20210112 header.b="oCRO/gXu";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
j9-20020a05640211c900b0045db850a506si12058426edw.46.2022.10.21.03.41.52;
Fri, 21 Oct 2022 03:42:17 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@gmail.com header.s=20210112 header.b="oCRO/gXu";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230036AbiJUKea (ORCPT <rfc822;pwkd43@gmail.com> + 99 others);
Fri, 21 Oct 2022 06:34:30 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60388 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230063AbiJUKe1 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Fri, 21 Oct 2022 06:34:27 -0400
Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com
[IPv6:2a00:1450:4864:20::235])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B874C25E09D
for <linux-kernel@vger.kernel.org>;
Fri, 21 Oct 2022 03:34:15 -0700 (PDT)
Received: by mail-lj1-x235.google.com with SMTP id x18so3145598ljm.1
for <linux-kernel@vger.kernel.org>;
Fri, 21 Oct 2022 03:34:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20210112;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=s10DD2bi79V+xICsKZzl2wJQlQcRDXrwKveFEEfHFNU=;
b=oCRO/gXukTuEN7c92C9uy2Bol2LZLb6cXCD9TX7r34pSE87lDOU86/UgNV9SCSU+OR
Z8z7NoSFahJwYIt1C9osmWfJSQEPabCoayUekxGvJgFkDTmY0tqx50pzdOUUuW8bBDwq
P3An/BjfZgYXMfomSYKzm13Gj6fodLxj1mWP7EoQ/he7e3sLxY2tuWf1WNiK1wHq03WZ
NKj/bSBM4dZssgcYSxYYh3Fm+OEk/xhJL9tiZxsbo/8TZgSdQWY6m9PxDvlaN1u4bw4M
H0DO3OMtzAgmlgXfTnKC4S/mi8Bjapw626HFBRcjfDAw+lK6lEnglz84JVT4Lc9U9QWW
eIYg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=s10DD2bi79V+xICsKZzl2wJQlQcRDXrwKveFEEfHFNU=;
b=bKYW30SPksAEybTnhIQvhC9t1m8h475BY4TQF0WPYsanGcSDj9J7W2TUQhhj79rH5P
OWM0kYdkyC6bgUC4Qk+UWGuSOZ+TZ0mDSL/gm/HuqN3mohGZoMidZm8SItI4tGlf/NsD
mw4u1r55JL1jTmwpGoWCsXpyQlncFe/M+6NIgDKBBW+NgwBJCUfUG3sUuBGoNqCqwoet
w2K40mkLiXLWB0FC9KAQ+vwtNQTujxRwIQC1MXsIoBRkc9sZcAREaoJ1OqmOjOoWP3+a
I8HPbuHMPHmkCgRluUHQeE/Qq/eEt/AlY4zT2rwkZcxaJRAzFSl7/VXUMasDmaroUtYk
RTGw==
X-Gm-Message-State: ACrzQf2R9jflClkoRbJf0Dx0BT92PeFO85sp5wyP5lbWAh6TV/BdqI8U
rIb8vJrjSBIKRiWJ6HGsKFg=
X-Received: by 2002:a05:651c:502:b0:26f:de48:7df3 with SMTP id
o2-20020a05651c050200b0026fde487df3mr6264192ljp.93.1666348453920;
Fri, 21 Oct 2022 03:34:13 -0700 (PDT)
Received: from
elroy-temp-vm.gaiao0uenmiufjlowqgp5yxwdh.gvxx.internal.cloudapp.net
([20.240.130.248])
by smtp.googlemail.com with ESMTPSA id
u12-20020ac258cc000000b00492d7a7b4e3sm3119775lfo.4.2022.10.21.03.34.13
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 21 Oct 2022 03:34:13 -0700 (PDT)
From: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
outreachy@lists.linux.dev,
Tanjuate Brunostar <tanjubrunostar0@gmail.com>
Subject: [PATCH v2 4/6] staging: vt6655: refactor long lines of code in
s_vGenerateTxParameter
Date: Fri, 21 Oct 2022 10:33:08 +0000
Message-Id:
<03dd39114b1e5c029cd8022245403a079ff03ae7.1666347511.git.tanjubrunostar0@gmail.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <cover.1666347511.git.tanjubrunostar0@gmail.com>
References: <cover.1666347511.git.tanjubrunostar0@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,
FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1747293503851243110?=
X-GMAIL-MSGID: =?utf-8?q?1747293503851243110?=
|
| Series |
a series of checkpatch fixes on the file: rxtx.c
|
|
Commit Message
Tanjuate Brunostar
Oct. 21, 2022, 10:33 a.m. UTC
fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 70 ++++++++++++++++++++++++-----------
1 file changed, 48 insertions(+), 22 deletions(-)
Comments
On 10/21/22 12:33, Tanjuate Brunostar wrote: > fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com> > --- > drivers/staging/vt6655/rxtx.c | 70 ++++++++++++++++++++++++----------- > 1 file changed, 48 insertions(+), 22 deletions(-) > > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c > index dc853b83459b..42f4261293ba 100644 > --- a/drivers/staging/vt6655/rxtx.c > +++ b/drivers/staging/vt6655/rxtx.c > @@ -839,7 +839,8 @@ s_vFillCTSHead(struct vnt_private *pDevice, > } > > if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { > - if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { > + if (byFBOption != AUTO_FB_NONE && uDMAIdx != > + TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { > /* Auto Fall back */ > struct vnt_cts_fb *buf = pvCTS; > /* Get SignalField, ServiceField & Length */ > @@ -878,7 +879,10 @@ s_vFillCTSHead(struct vnt_private *pDevice, > > ether_addr_copy(buf->data.ra, > pDevice->abyCurrentNetAddr); > - } else { /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) */ > + } else { > + /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && > + * uDMAIdx != TYPE_BEACONDMA) > + */ > struct vnt_cts *buf = pvCTS; > /* Get SignalField, ServiceField & Length */ > vnt_get_phy_field(pDevice, uCTSFrameLen, > @@ -964,50 +968,72 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, > /* Fill RsvTime */ > struct vnt_rrv_time_rts *buf = pvRrvTime; > > - buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); > - buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, wCurrentRate); > - buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); > - > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > + buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, > + wCurrentRate); > + buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, > + wCurrentRate); > + buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, > + wCurrentRate); > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > + wCurrentRate, bNeedACK); > + buf->rrv_time_b = > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > + pDevice->byTopCCKBasicRate, bNeedACK); > + > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > + psEthHeader, wCurrentRate, byFBOption); > } else {/* RTS_needless, PCF mode */ > struct vnt_rrv_time_cts *buf = pvRrvTime; > > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); > - buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, wCurrentRate); > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > + wCurrentRate, bNeedACK); > + buf->rrv_time_b = > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > + pDevice->byTopCCKBasicRate, bNeedACK); > + buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, > + wCurrentRate); > > /* Fill CTS */ > - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption); > + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, > + bDisCRC, wCurrentRate, byFBOption); > } > } else if (byPktType == PK_TYPE_11A) { > if (pvRTS) {/* RTS_need, non PCF mode */ > - struct vnt_rrv_time_ab *buf = pvRrvTime; Error during compiliation in next line > + struct vnt_rrv_time_ab *buf = pvRrvT > + ime; make: Entering directory '/home/kernel/Documents/git/kernels/staging' CC [M] drivers/staging/vt6655/rxtx.o drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’: drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first use in this function) 1014 | struct vnt_rrv_time_ab *buf = pvRrvT | ^~~~~~ drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before ‘ime’ 1015 | ime; | ^~~ make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o] Error 1 make: *** [Makefile:1992: drivers/staging/vt6655] Error 2 make: Leaving directory '/home/kernel/Documents/git/kernels/staging' > > - buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > + buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, > + wCurrentRate); > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > + wCurrentRate, bNeedACK); > > /* Fill RTS */ > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > + psEthHeader, wCurrentRate, byFBOption); > } else if (!pvRTS) {/* RTS_needless, non PCF mode */ > struct vnt_rrv_time_ab *buf = pvRrvTime; > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK); > + buf->rrv_time = > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, > + wCurrentRate, bNeedACK); > } > } else if (byPktType == PK_TYPE_11B) { > if (pvRTS) {/* RTS_need, non PCF mode */ > struct vnt_rrv_time_ab *buf = pvRrvTime; > > - buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); > + buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, > + wCurrentRate); > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > + wCurrentRate, bNeedACK); > > /* Fill RTS */ > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > + psEthHeader, wCurrentRate, byFBOption); > } else { /* RTS_needless, non PCF mode */ > struct vnt_rrv_time_ab *buf = pvRrvTime; > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > + wCurrentRate, bNeedACK); > } > } > }
On Fri, Oct 21, 2022 at 5:52 PM Philipp Hortmann <philipp.g.hortmann@gmail.com> wrote: > > On 10/21/22 12:33, Tanjuate Brunostar wrote: > > fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter > > > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com> > > --- > > drivers/staging/vt6655/rxtx.c | 70 ++++++++++++++++++++++++----------- > > 1 file changed, 48 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c > > index dc853b83459b..42f4261293ba 100644 > > --- a/drivers/staging/vt6655/rxtx.c > > +++ b/drivers/staging/vt6655/rxtx.c > > @@ -839,7 +839,8 @@ s_vFillCTSHead(struct vnt_private *pDevice, > > } > > > > if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { > > - if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { > > + if (byFBOption != AUTO_FB_NONE && uDMAIdx != > > + TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { > > /* Auto Fall back */ > > struct vnt_cts_fb *buf = pvCTS; > > /* Get SignalField, ServiceField & Length */ > > @@ -878,7 +879,10 @@ s_vFillCTSHead(struct vnt_private *pDevice, > > > > ether_addr_copy(buf->data.ra, > > pDevice->abyCurrentNetAddr); > > - } else { /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) */ > > + } else { > > + /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && > > + * uDMAIdx != TYPE_BEACONDMA) > > + */ > > struct vnt_cts *buf = pvCTS; > > /* Get SignalField, ServiceField & Length */ > > vnt_get_phy_field(pDevice, uCTSFrameLen, > > @@ -964,50 +968,72 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, > > /* Fill RsvTime */ > > struct vnt_rrv_time_rts *buf = pvRrvTime; > > > > - buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); > > - buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, wCurrentRate); > > - buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); > > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); > > - > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > > + buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, > > + wCurrentRate); > > + buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, > > + wCurrentRate); > > + buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, > > + wCurrentRate); > > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > > + wCurrentRate, bNeedACK); > > + buf->rrv_time_b = > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > > + pDevice->byTopCCKBasicRate, bNeedACK); > > + > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > > + psEthHeader, wCurrentRate, byFBOption); > > } else {/* RTS_needless, PCF mode */ > > struct vnt_rrv_time_cts *buf = pvRrvTime; > > > > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); > > - buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, wCurrentRate); > > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > > + wCurrentRate, bNeedACK); > > + buf->rrv_time_b = > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > > + pDevice->byTopCCKBasicRate, bNeedACK); > > + buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, > > + wCurrentRate); > > > > /* Fill CTS */ > > - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption); > > + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, > > + bDisCRC, wCurrentRate, byFBOption); > > } > > } else if (byPktType == PK_TYPE_11A) { > > if (pvRTS) {/* RTS_need, non PCF mode */ > > - struct vnt_rrv_time_ab *buf = pvRrvTime; > > Error during compiliation in next line > > > + struct vnt_rrv_time_ab *buf = pvRrvT > > + ime; > > make: Entering directory '/home/kernel/Documents/git/kernels/staging' > CC [M] drivers/staging/vt6655/rxtx.o > drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’: > drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first > use in this function) > 1014 | struct vnt_rrv_time_ab *buf = pvRrvT > | ^~~~~~ > drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier > is reported only once for each function it appears in > drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before > ‘ime’ > 1015 | ime; > | ^~~ > make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o] > Error 1 > make: *** [Makefile:1992: drivers/staging/vt6655] Error 2 > make: Leaving directory '/home/kernel/Documents/git/kernels/staging' > This error occured on the first version of this patch. I corrected it, compiled the code and the error was gone before I sent this version. please check again. You may have seen this error on the first version and not this one. thanks Tanju > > > > - buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > > + buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, > > + wCurrentRate); > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > > + wCurrentRate, bNeedACK); > > > > /* Fill RTS */ > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > > + psEthHeader, wCurrentRate, byFBOption); > > } else if (!pvRTS) {/* RTS_needless, non PCF mode */ > > struct vnt_rrv_time_ab *buf = pvRrvTime; > > > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK); > > + buf->rrv_time = > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, > > + wCurrentRate, bNeedACK); > > } > > } else if (byPktType == PK_TYPE_11B) { > > if (pvRTS) {/* RTS_need, non PCF mode */ > > struct vnt_rrv_time_ab *buf = pvRrvTime; > > > > - buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); > > + buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, > > + wCurrentRate); > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > > + wCurrentRate, bNeedACK); > > > > /* Fill RTS */ > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > > + psEthHeader, wCurrentRate, byFBOption); > > } else { /* RTS_needless, non PCF mode */ > > struct vnt_rrv_time_ab *buf = pvRrvTime; > > > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > > + wCurrentRate, bNeedACK); > > } > > } > > } >
On Fri, Oct 21, 2022 at 7:08 PM Tanju Brunostar <tanjubrunostar0@gmail.com> wrote: > > On Fri, Oct 21, 2022 at 5:52 PM Philipp Hortmann > <philipp.g.hortmann@gmail.com> wrote: > > > > On 10/21/22 12:33, Tanjuate Brunostar wrote: > > > fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter > > > > > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com> > > > --- > > > drivers/staging/vt6655/rxtx.c | 70 ++++++++++++++++++++++++----------- > > > 1 file changed, 48 insertions(+), 22 deletions(-) > > > > > > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c > > > index dc853b83459b..42f4261293ba 100644 > > > --- a/drivers/staging/vt6655/rxtx.c > > > +++ b/drivers/staging/vt6655/rxtx.c > > > @@ -839,7 +839,8 @@ s_vFillCTSHead(struct vnt_private *pDevice, > > > } > > > > > > if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { > > > - if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { > > > + if (byFBOption != AUTO_FB_NONE && uDMAIdx != > > > + TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { > > > /* Auto Fall back */ > > > struct vnt_cts_fb *buf = pvCTS; > > > /* Get SignalField, ServiceField & Length */ > > > @@ -878,7 +879,10 @@ s_vFillCTSHead(struct vnt_private *pDevice, > > > > > > ether_addr_copy(buf->data.ra, > > > pDevice->abyCurrentNetAddr); > > > - } else { /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) */ > > > + } else { > > > + /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && > > > + * uDMAIdx != TYPE_BEACONDMA) > > > + */ > > > struct vnt_cts *buf = pvCTS; > > > /* Get SignalField, ServiceField & Length */ > > > vnt_get_phy_field(pDevice, uCTSFrameLen, > > > @@ -964,50 +968,72 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, > > > /* Fill RsvTime */ > > > struct vnt_rrv_time_rts *buf = pvRrvTime; > > > > > > - buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); > > > - buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, wCurrentRate); > > > - buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); > > > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > > > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); > > > - > > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > > > + buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, > > > + wCurrentRate); > > > + buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, > > > + wCurrentRate); > > > + buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, > > > + wCurrentRate); > > > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > > > + wCurrentRate, bNeedACK); > > > + buf->rrv_time_b = > > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > > > + pDevice->byTopCCKBasicRate, bNeedACK); > > > + > > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > > > + psEthHeader, wCurrentRate, byFBOption); > > > } else {/* RTS_needless, PCF mode */ > > > struct vnt_rrv_time_cts *buf = pvRrvTime; > > > > > > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > > > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); > > > - buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, wCurrentRate); > > > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > > > + wCurrentRate, bNeedACK); > > > + buf->rrv_time_b = > > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > > > + pDevice->byTopCCKBasicRate, bNeedACK); > > > + buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, > > > + wCurrentRate); > > > > > > /* Fill CTS */ > > > - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption); > > > + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, > > > + bDisCRC, wCurrentRate, byFBOption); > > > } > > > } else if (byPktType == PK_TYPE_11A) { > > > if (pvRTS) {/* RTS_need, non PCF mode */ > > > - struct vnt_rrv_time_ab *buf = pvRrvTime; > > > > Error during compiliation in next line > > > > > + struct vnt_rrv_time_ab *buf = pvRrvT > > > + ime; > > > > make: Entering directory '/home/kernel/Documents/git/kernels/staging' > > CC [M] drivers/staging/vt6655/rxtx.o > > drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’: > > drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first > > use in this function) > > 1014 | struct vnt_rrv_time_ab *buf = pvRrvT > > | ^~~~~~ > > drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier > > is reported only once for each function it appears in > > drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before > > ‘ime’ > > 1015 | ime; > > | ^~~ > > make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o] > > Error 1 > > make: *** [Makefile:1992: drivers/staging/vt6655] Error 2 > > make: Leaving directory '/home/kernel/Documents/git/kernels/staging' > > > This error occured on the first version of this patch. I corrected it, > compiled the code and the error was gone before I sent this version. > please check again. You may have seen this error on the first version > and not this one. > thanks > > Tanju On the first patch, this error was detected by the kernel bot. This time around, the kernel bot did not detect it, meaning it was fixed. > > > > > > - buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); > > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); > > > + buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, > > > + wCurrentRate); > > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, > > > + wCurrentRate, bNeedACK); > > > > > > /* Fill RTS */ > > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > > > + psEthHeader, wCurrentRate, byFBOption); > > > } else if (!pvRTS) {/* RTS_needless, non PCF mode */ > > > struct vnt_rrv_time_ab *buf = pvRrvTime; > > > > > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK); > > > + buf->rrv_time = > > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, > > > + wCurrentRate, bNeedACK); > > > } > > > } else if (byPktType == PK_TYPE_11B) { > > > if (pvRTS) {/* RTS_need, non PCF mode */ > > > struct vnt_rrv_time_ab *buf = pvRrvTime; > > > > > > - buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); > > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); > > > + buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, > > > + wCurrentRate); > > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > > > + wCurrentRate, bNeedACK); > > > > > > /* Fill RTS */ > > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); > > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, > > > + psEthHeader, wCurrentRate, byFBOption); > > > } else { /* RTS_needless, non PCF mode */ > > > struct vnt_rrv_time_ab *buf = pvRrvTime; > > > > > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); > > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, > > > + wCurrentRate, bNeedACK); > > > } > > > } > > > } > >
On 10/21/22 20:14, Tanju Brunostar wrote: >>> Error during compiliation in next line >>> >>>> + struct vnt_rrv_time_ab *buf = pvRrvT >>>> + ime; >>> make: Entering directory '/home/kernel/Documents/git/kernels/staging' >>> CC [M] drivers/staging/vt6655/rxtx.o >>> drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’: >>> drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first >>> use in this function) >>> 1014 | struct vnt_rrv_time_ab *buf = pvRrvT >>> | ^~~~~~ >>> drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier >>> is reported only once for each function it appears in >>> drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before >>> ‘ime’ >>> 1015 | ime; >>> | ^~~ >>> make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o] >>> Error 1 >>> make: *** [Makefile:1992: drivers/staging/vt6655] Error 2 >>> make: Leaving directory '/home/kernel/Documents/git/kernels/staging' >>> >> This error occured on the first version of this patch. I corrected it, >> compiled the code and the error was gone before I sent this version. >> please check again. You may have seen this error on the first version >> and not this one. >> thanks >> >> Tanju > On the first patch, this error was detected by the kernel bot. This > time around, the kernel bot did not detect it, meaning it was fixed. Please check the outbox of your email account and have a look. This is the v2 Patch and it contains this two lines: >>>> + struct vnt_rrv_time_ab *buf = pvRrvT >>>> + ime; which do not compile. Bye Philipp
On Sat, Oct 22, 2022 at 5:39 AM Philipp Hortmann <philipp.g.hortmann@gmail.com> wrote: > > On 10/21/22 20:14, Tanju Brunostar wrote: > >>> Error during compiliation in next line > >>> > >>>> + struct vnt_rrv_time_ab *buf = pvRrvT > >>>> + ime; > >>> make: Entering directory '/home/kernel/Documents/git/kernels/staging' > >>> CC [M] drivers/staging/vt6655/rxtx.o > >>> drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’: > >>> drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first > >>> use in this function) > >>> 1014 | struct vnt_rrv_time_ab *buf = pvRrvT > >>> | ^~~~~~ > >>> drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier > >>> is reported only once for each function it appears in > >>> drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before > >>> ‘ime’ > >>> 1015 | ime; > >>> | ^~~ > >>> make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o] > >>> Error 1 > >>> make: *** [Makefile:1992: drivers/staging/vt6655] Error 2 > >>> make: Leaving directory '/home/kernel/Documents/git/kernels/staging' > >>> > >> This error occured on the first version of this patch. I corrected it, > >> compiled the code and the error was gone before I sent this version. > >> please check again. You may have seen this error on the first version > >> and not this one. > >> thanks > >> > >> Tanju > > On the first patch, this error was detected by the kernel bot. This > > time around, the kernel bot did not detect it, meaning it was fixed. > > Please check the outbox of your email account and have a look. This is > the v2 Patch and it contains this two lines: > >>>> + struct vnt_rrv_time_ab *buf = pvRrvT > >>>> + ime; > which do not compile. > > Bye Philipp Oh you are right. I don't know how this is possible. I will send a third version.
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index dc853b83459b..42f4261293ba 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -839,7 +839,8 @@ s_vFillCTSHead(struct vnt_private *pDevice, } if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { - if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { + if (byFBOption != AUTO_FB_NONE && uDMAIdx != + TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { /* Auto Fall back */ struct vnt_cts_fb *buf = pvCTS; /* Get SignalField, ServiceField & Length */ @@ -878,7 +879,10 @@ s_vFillCTSHead(struct vnt_private *pDevice, ether_addr_copy(buf->data.ra, pDevice->abyCurrentNetAddr); - } else { /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) */ + } else { + /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && + * uDMAIdx != TYPE_BEACONDMA) + */ struct vnt_cts *buf = pvCTS; /* Get SignalField, ServiceField & Length */ vnt_get_phy_field(pDevice, uCTSFrameLen, @@ -964,50 +968,72 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, /* Fill RsvTime */ struct vnt_rrv_time_rts *buf = pvRrvTime; - buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); - buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, wCurrentRate); - buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); - - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); + buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, + wCurrentRate); + buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, + wCurrentRate); + buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, + wCurrentRate); + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, + wCurrentRate, bNeedACK); + buf->rrv_time_b = + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, + pDevice->byTopCCKBasicRate, bNeedACK); + + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, + psEthHeader, wCurrentRate, byFBOption); } else {/* RTS_needless, PCF mode */ struct vnt_rrv_time_cts *buf = pvRrvTime; - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); - buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, wCurrentRate); + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, + wCurrentRate, bNeedACK); + buf->rrv_time_b = + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, + pDevice->byTopCCKBasicRate, bNeedACK); + buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, + wCurrentRate); /* Fill CTS */ - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption); + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, + bDisCRC, wCurrentRate, byFBOption); } } else if (byPktType == PK_TYPE_11A) { if (pvRTS) {/* RTS_need, non PCF mode */ - struct vnt_rrv_time_ab *buf = pvRrvTime; + struct vnt_rrv_time_ab *buf = pvRrvT + ime; - buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); + buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, + wCurrentRate); + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, + wCurrentRate, bNeedACK); /* Fill RTS */ - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, + psEthHeader, wCurrentRate, byFBOption); } else if (!pvRTS) {/* RTS_needless, non PCF mode */ struct vnt_rrv_time_ab *buf = pvRrvTime; - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK); + buf->rrv_time = + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, + wCurrentRate, bNeedACK); } } else if (byPktType == PK_TYPE_11B) { if (pvRTS) {/* RTS_need, non PCF mode */ struct vnt_rrv_time_ab *buf = pvRrvTime; - buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); + buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, + wCurrentRate); + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, + wCurrentRate, bNeedACK); /* Fill RTS */ - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, + psEthHeader, wCurrentRate, byFBOption); } else { /* RTS_needless, non PCF mode */ struct vnt_rrv_time_ab *buf = pvRrvTime; - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, + wCurrentRate, bNeedACK); } } }