Message ID | 6742e42999e05ddf09318a0a3bda9ce23b6ae562.1666849707.git.tanjubrunostar0@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp51813wru; Wed, 26 Oct 2022 23:03:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6wDtI/fPA59ubGjmTcgo11pkGfL1aFH7/sXNWMp1tOEkaOcn2gUdGU6eH478qStubz9mLA X-Received: by 2002:a17:903:1209:b0:179:d027:66e6 with SMTP id l9-20020a170903120900b00179d02766e6mr48436915plh.67.1666850576468; Wed, 26 Oct 2022 23:02:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666850576; cv=none; d=google.com; s=arc-20160816; b=1K7KAIhmDPQ3WmnnE+bTzDITd50LneIcBKQfv4JDbVNpF3h1lqCRnkUFlJK6HI2m6d HrsY/htr99t7xA/nVNuhXzcQ2R3GgHN2lSC74kg2K6cvECrk/hF+vfoYG6R2GlquH4ch nVGM2C7zhRgDNCRkk4zQXbef4Q7xf8LITO2DGKujLrMaYEQtR2/A9/G/hAZGjitULbB0 L1ZNrePyTQyEWz2sSTceaykw+aQ+yW3zh9S1cVDT4t5/BIlPsBL5PiWsDyLGngMziTOQ dmCbGEB44f4KfEU1Q1iZ7L6fa1+GwTrNQiDTXD35FS1exgDGIJsivCjSujN3W9QAO3qo hJHg== 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=5iA9FQCCsPWBm44+xNI1z9eJC+PJ5gHzpB5ZmyGrAxc=; b=YDm6J0imQiyFdK24XbcYTvuaxY3bZxmld8QwI4X4hFg1C1k/gVk5K8W3TFiew1tQvz oavkdM22WpxFZLMRC9CWz1E3Rv0Toh/+w9UiWKFGswfKPExv6gRWKHUgM7MVB0nAOcv3 moPPsFXLFnWzIb/vjDtwXdO6OcEu0Mu1WfLzJTepoRaEZ7N4PqcusoqanJ7zEQxMG2le SmojRBq2L3Ak4gMg3KvorMYmXmOL+NYk/ZKzGvEEaX3kA2U/I6y4dHts93JSYxU/2znp fDq9HZmQLLw9/VU6ZqBF8Q8AQHSO92BVxgKe3oJUsvy8xR6ut0KxIqyWmtwB7h3c5W5c HGAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LN5VNnCu; 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 ay5-20020a1709028b8500b0018128753b25si493477plb.271.2022.10.26.23.02.42; Wed, 26 Oct 2022 23:02:56 -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=LN5VNnCu; 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 S234248AbiJ0GBv (ORCPT <rfc822;hiifong.im@gmail.com> + 99 others); Thu, 27 Oct 2022 02:01:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234193AbiJ0GBs (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 27 Oct 2022 02:01:48 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE2217AB38 for <linux-kernel@vger.kernel.org>; Wed, 26 Oct 2022 23:01:46 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id k19so472080lji.2 for <linux-kernel@vger.kernel.org>; Wed, 26 Oct 2022 23:01:46 -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=5iA9FQCCsPWBm44+xNI1z9eJC+PJ5gHzpB5ZmyGrAxc=; b=LN5VNnCu1kBAQRLTdvN+9Jdx0VY9f1UrI24J/M53d1qe2NzB2UkkwmaO5D086EY2vJ +BhGIaR6UU3apn5mtqkQd9SaHOAShENsLDDBs+PInBtLvUhc79ElEq9/gPsporHjhfJp oJs2r4kCvQV2jseTuXsqPa/UPJ1Kza2dqJr6a0YvJNhUpeAy/00bJYuG6NEk1AWNt3jI 2ny08rLPB5w9AlNlNvaE5i+qi4ThMKn9Fs4ddXFjzN4qrpjfx/I8x9HZllUYb/ct+wXY qV6A/0jDsKvtrlJu7Vvm8VnSlNlaU96qEumq2O/Moda5UyBb84F9qDJhUqgDxyNEC8Wb kTfA== 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=5iA9FQCCsPWBm44+xNI1z9eJC+PJ5gHzpB5ZmyGrAxc=; b=3sv9qeBlRz+HpOqCR4BlllxggB+7pCe/ratz6nKsJ/reJuN7NYA/Hlzrly7dtDH0JD WO+rXOuZ5QC545gUFWjvUHi3T0x/zRkS+O2l1DhVL8KSt68L00vodMnN3HvEoYT4mYjc XyW6eUVR9eXfqd0Ogbf2J+QCxuzYJXJLQY7xPOxM9DQ/TqmU4JvphYWIWMPXKOIe3C1q m1TZfa++efvWl9k2/HoTqHRW9APi7Vmt+e9momSmSuKVAK9DWH7Vt/moJULrMYkpjeQr xdGJ9DXqV0eMmdny3HBGsE6LK/0iMQ0EaSYCKO8ApuHVRDSmOiFtzVvTsJJpBLkRTx35 D4ZQ== X-Gm-Message-State: ACrzQf1gCu7R8YNAv7VDVjOsyruent/SAcm3EpfDNtHfWQi9xRg5SfSo 2hXTknpgZjPIqwiJQcYyR6E= X-Received: by 2002:a2e:509:0:b0:277:44d:569c with SMTP id 9-20020a2e0509000000b00277044d569cmr9633146ljf.88.1666850505198; Wed, 26 Oct 2022 23:01:45 -0700 (PDT) Received: from elroy-temp-vm.gaiao0uenmiufjlowqgp5yxwdh.gvxx.internal.cloudapp.net ([20.240.130.248]) by smtp.googlemail.com with ESMTPSA id j3-20020a056512344300b0049fff3f645esm61537lfr.70.2022.10.26.23.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 23:01:44 -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 v5 1/6] staging: vt6655: fix lines ending in a '(' Date: Thu, 27 Oct 2022 06:01:25 +0000 Message-Id: <6742e42999e05ddf09318a0a3bda9ce23b6ae562.1666849707.git.tanjubrunostar0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <cover.1666849707.git.tanjubrunostar0@gmail.com> References: <cover.1666849707.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?1747819510070369810?= X-GMAIL-MSGID: =?utf-8?q?1747819510070369810?= |
Series |
staging: vt6655: a series of checkpatch fixes on the file: rxtx.c
|
|
Commit Message
Tanjuate Brunostar
Oct. 27, 2022, 6:01 a.m. UTC
fix serveral checkpatch errors related to lines ending with a '(' by
refactoring the code lines
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++--------------------
1 file changed, 69 insertions(+), 96 deletions(-)
Comments
On Thu, Oct 27, 2022 at 08:59:03AM +0000, Tanjuate Brunostar wrote: > fix serveral checkpatch errors related to lines ending with a '(' by > refactoring the code lines Moving line endings is not "refactoring". "refactoring" is changing actual code, sorry. greg k-h
On 10/27/22 11:05, Tanjuate Brunostar wrote: > fix serveral checkpatch errors related to lines ending with a '(' by > refactoring the code lines Patch series coverletter is missing or the wrong one was send. [PATCH v6 1_6] staging_ vt6655_ fix lines ending in a '('-4646.txt WARNING: 'serveral' may be misspelled - perhaps 'several'? #7: fix serveral checkpatch errors related to lines ending with a '(' by ^^^^^^^^
On 10/28/22 08:39, Tanjuate Brunostar wrote: > fix several checkpatch errors related to lines ending with a '(' by > joining splitted lines of code and indenting properly to increase > visibility > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com> > --- > drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- > 1 file changed, 69 insertions(+), 96 deletions(-) > > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c > index 1e5036121665..7eb7c6eb5cf0 100644 > --- a/drivers/staging/vt6655/rxtx.c > +++ b/drivers/staging/vt6655/rxtx.c > @@ -139,15 +139,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate) > * PK_TYPE_11GB 2 > * PK_TYPE_11GA 3 > */ > -static > -unsigned int > -s_uGetTxRsvTime( > - struct vnt_private *pDevice, > - unsigned char byPktType, > - unsigned int cbFrameLength, > - unsigned short wRate, > - bool bNeedAck > -) > +static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, > + unsigned char byPktType, > + unsigned int cbFrameLength, > + unsigned short wRate, > + bool bNeedAck) > { > unsigned int uDataTime, uAckTime; > > @@ -214,20 +210,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv, > } > > /* byFreqType 0: 5GHz, 1:2.4Ghz */ > -static > -unsigned int > -s_uGetDataDuration( > - struct vnt_private *pDevice, > - unsigned char byDurType, > - unsigned int cbFrameLength, > - unsigned char byPktType, > - unsigned short wRate, > - bool bNeedAck, > - unsigned int uFragIdx, > - unsigned int cbLastFragmentSize, > - unsigned int uMACfragNum, > - unsigned char byFBOption > -) > +static unsigned int s_uGetDataDuration(struct vnt_private *pDevice, > + unsigned char byDurType, > + unsigned int cbFrameLength, > + unsigned char byPktType, > + unsigned short wRate, > + bool bNeedAck, > + unsigned int uFragIdx, > + unsigned int cbLastFragmentSize, > + unsigned int uMACfragNum, > + unsigned char byFBOption) > { > bool bLastFrag = false; > unsigned int uAckTime = 0, uNextPktTime = 0, len; > @@ -316,17 +308,13 @@ s_uGetDataDuration( > } > > /* byFreqType: 0=>5GHZ 1=>2.4GHZ */ > -static > -__le16 > -s_uGetRTSCTSDuration( > - struct vnt_private *pDevice, > - unsigned char byDurType, > - unsigned int cbFrameLength, > - unsigned char byPktType, > - unsigned short wRate, > - bool bNeedAck, > - unsigned char byFBOption > -) > +static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice, > + unsigned char byDurType, > + unsigned int cbFrameLength, > + unsigned char byPktType, > + unsigned short wRate, > + bool bNeedAck, > + unsigned char byFBOption) > { > unsigned int uCTSTime = 0, uDurTime = 0; > > @@ -409,22 +397,18 @@ s_uGetRTSCTSDuration( > return cpu_to_le16((u16)uDurTime); > } > > -static > -__le16 > -s_uFillDataHead( > - struct vnt_private *pDevice, > - unsigned char byPktType, > - void *pTxDataHead, > - unsigned int cbFrameLength, > - unsigned int uDMAIdx, > - bool bNeedAck, > - unsigned int uFragIdx, > - unsigned int cbLastFragmentSize, > - unsigned int uMACfragNum, > - unsigned char byFBOption, > - unsigned short wCurrentRate, > - bool is_pspoll > -) > +static __le16 s_uFillDataHead(struct vnt_private *pDevice, > + unsigned char byPktType, > + void *pTxDataHead, > + unsigned int cbFrameLength, > + unsigned int uDMAIdx, > + bool bNeedAck, > + unsigned int uFragIdx, > + unsigned int cbLastFragmentSize, > + unsigned int uMACfragNum, > + unsigned char byFBOption, > + unsigned short wCurrentRate, > + bool is_pspoll) > { > struct vnt_tx_datahead_ab *buf = pTxDataHead; > > @@ -555,19 +539,15 @@ s_uFillDataHead( > return buf->duration; > } > > -static > -void > -s_vFillRTSHead( > - struct vnt_private *pDevice, > - unsigned char byPktType, > - void *pvRTS, > - unsigned int cbFrameLength, > - bool bNeedAck, > - bool bDisCRC, > - struct ieee80211_hdr *hdr, > - unsigned short wCurrentRate, > - unsigned char byFBOption > -) > +static void s_vFillRTSHead(struct vnt_private *pDevice, > + unsigned char byPktType, > + void *pvRTS, > + unsigned int cbFrameLength, > + bool bNeedAck, > + bool bDisCRC, > + struct ieee80211_hdr *hdr, > + unsigned short wCurrentRate, > + unsigned char byFBOption) > { > unsigned int uRTSFrameLen = 20; > > @@ -750,19 +730,15 @@ s_vFillRTSHead( > } > } > > -static > -void > -s_vFillCTSHead( > - struct vnt_private *pDevice, > - unsigned int uDMAIdx, > - unsigned char byPktType, > - void *pvCTS, > - unsigned int cbFrameLength, > - bool bNeedAck, > - bool bDisCRC, > - unsigned short wCurrentRate, > - unsigned char byFBOption > -) > +static void s_vFillCTSHead(struct vnt_private *pDevice, > + unsigned int uDMAIdx, > + unsigned char byPktType, > + void *pvCTS, > + unsigned int cbFrameLength, > + bool bNeedAck, > + bool bDisCRC, > + unsigned short wCurrentRate, > + unsigned char byFBOption) > { > unsigned int uCTSFrameLen = 14; > > @@ -868,21 +844,17 @@ s_vFillCTSHead( > - > * unsigned int cbFrameSize, Hdr+Payload+FCS > */ > -static > -void > -s_vGenerateTxParameter( > - struct vnt_private *pDevice, > - unsigned char byPktType, > - struct vnt_tx_fifo_head *tx_buffer_head, > - void *pvRrvTime, > - void *pvRTS, > - void *pvCTS, > - unsigned int cbFrameSize, > - bool bNeedACK, > - unsigned int uDMAIdx, > - void *psEthHeader, > - unsigned short wCurrentRate > -) > +static void s_vGenerateTxParameter(struct vnt_private *pDevice, > + unsigned char byPktType, > + struct vnt_tx_fifo_head *tx_buffer_head, > + void *pvRrvTime, > + void *pvRTS, > + void *pvCTS, > + unsigned int cbFrameSize, > + bool bNeedACK, > + unsigned int uDMAIdx, > + void *psEthHeader, > + unsigned short wCurrentRate) > { > u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl); > bool bDisCRC = false; > @@ -954,11 +926,12 @@ s_vGenerateTxParameter( > } > } > > -static unsigned int > -s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, > - unsigned char *pbyTxBufferAddr, > - unsigned int uDMAIdx, struct vnt_tx_desc *pHeadTD, > - unsigned int is_pspoll) > +static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, > + unsigned char byPktType, > + unsigned char *pbyTxBufferAddr, > + unsigned int uDMAIdx, > + struct vnt_tx_desc *pHeadTD, > + unsigned int is_pspoll) > { > struct vnt_td_info *td_info = pHeadTD->td_info; > struct sk_buff *skb = td_info->skb; Patch series coverletter is missing or the wrong one was send. Changelog is also missing.
On Fri, Oct 28, 2022 at 3:57 PM Philipp Hortmann <philipp.g.hortmann@gmail.com> wrote: > > On 10/28/22 08:39, Tanjuate Brunostar wrote: > > fix several checkpatch errors related to lines ending with a '(' by > > joining splitted lines of code and indenting properly to increase > > visibility > > > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com> > > --- > > drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- > > 1 file changed, 69 insertions(+), 96 deletions(-) > > > > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c > > index 1e5036121665..7eb7c6eb5cf0 100644 > > --- a/drivers/staging/vt6655/rxtx.c > > +++ b/drivers/staging/vt6655/rxtx.c > > @@ -139,15 +139,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate) > > * PK_TYPE_11GB 2 > > * PK_TYPE_11GA 3 > > */ > > -static > > -unsigned int > > -s_uGetTxRsvTime( > > - struct vnt_private *pDevice, > > - unsigned char byPktType, > > - unsigned int cbFrameLength, > > - unsigned short wRate, > > - bool bNeedAck > > -) > > +static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + unsigned int cbFrameLength, > > + unsigned short wRate, > > + bool bNeedAck) > > { > > unsigned int uDataTime, uAckTime; > > > > @@ -214,20 +210,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv, > > } > > > > /* byFreqType 0: 5GHz, 1:2.4Ghz */ > > -static > > -unsigned int > > -s_uGetDataDuration( > > - struct vnt_private *pDevice, > > - unsigned char byDurType, > > - unsigned int cbFrameLength, > > - unsigned char byPktType, > > - unsigned short wRate, > > - bool bNeedAck, > > - unsigned int uFragIdx, > > - unsigned int cbLastFragmentSize, > > - unsigned int uMACfragNum, > > - unsigned char byFBOption > > -) > > +static unsigned int s_uGetDataDuration(struct vnt_private *pDevice, > > + unsigned char byDurType, > > + unsigned int cbFrameLength, > > + unsigned char byPktType, > > + unsigned short wRate, > > + bool bNeedAck, > > + unsigned int uFragIdx, > > + unsigned int cbLastFragmentSize, > > + unsigned int uMACfragNum, > > + unsigned char byFBOption) > > { > > bool bLastFrag = false; > > unsigned int uAckTime = 0, uNextPktTime = 0, len; > > @@ -316,17 +308,13 @@ s_uGetDataDuration( > > } > > > > /* byFreqType: 0=>5GHZ 1=>2.4GHZ */ > > -static > > -__le16 > > -s_uGetRTSCTSDuration( > > - struct vnt_private *pDevice, > > - unsigned char byDurType, > > - unsigned int cbFrameLength, > > - unsigned char byPktType, > > - unsigned short wRate, > > - bool bNeedAck, > > - unsigned char byFBOption > > -) > > +static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice, > > + unsigned char byDurType, > > + unsigned int cbFrameLength, > > + unsigned char byPktType, > > + unsigned short wRate, > > + bool bNeedAck, > > + unsigned char byFBOption) > > { > > unsigned int uCTSTime = 0, uDurTime = 0; > > > > @@ -409,22 +397,18 @@ s_uGetRTSCTSDuration( > > return cpu_to_le16((u16)uDurTime); > > } > > > > -static > > -__le16 > > -s_uFillDataHead( > > - struct vnt_private *pDevice, > > - unsigned char byPktType, > > - void *pTxDataHead, > > - unsigned int cbFrameLength, > > - unsigned int uDMAIdx, > > - bool bNeedAck, > > - unsigned int uFragIdx, > > - unsigned int cbLastFragmentSize, > > - unsigned int uMACfragNum, > > - unsigned char byFBOption, > > - unsigned short wCurrentRate, > > - bool is_pspoll > > -) > > +static __le16 s_uFillDataHead(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + void *pTxDataHead, > > + unsigned int cbFrameLength, > > + unsigned int uDMAIdx, > > + bool bNeedAck, > > + unsigned int uFragIdx, > > + unsigned int cbLastFragmentSize, > > + unsigned int uMACfragNum, > > + unsigned char byFBOption, > > + unsigned short wCurrentRate, > > + bool is_pspoll) > > { > > struct vnt_tx_datahead_ab *buf = pTxDataHead; > > > > @@ -555,19 +539,15 @@ s_uFillDataHead( > > return buf->duration; > > } > > > > -static > > -void > > -s_vFillRTSHead( > > - struct vnt_private *pDevice, > > - unsigned char byPktType, > > - void *pvRTS, > > - unsigned int cbFrameLength, > > - bool bNeedAck, > > - bool bDisCRC, > > - struct ieee80211_hdr *hdr, > > - unsigned short wCurrentRate, > > - unsigned char byFBOption > > -) > > +static void s_vFillRTSHead(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + void *pvRTS, > > + unsigned int cbFrameLength, > > + bool bNeedAck, > > + bool bDisCRC, > > + struct ieee80211_hdr *hdr, > > + unsigned short wCurrentRate, > > + unsigned char byFBOption) > > { > > unsigned int uRTSFrameLen = 20; > > > > @@ -750,19 +730,15 @@ s_vFillRTSHead( > > } > > } > > > > -static > > -void > > -s_vFillCTSHead( > > - struct vnt_private *pDevice, > > - unsigned int uDMAIdx, > > - unsigned char byPktType, > > - void *pvCTS, > > - unsigned int cbFrameLength, > > - bool bNeedAck, > > - bool bDisCRC, > > - unsigned short wCurrentRate, > > - unsigned char byFBOption > > -) > > +static void s_vFillCTSHead(struct vnt_private *pDevice, > > + unsigned int uDMAIdx, > > + unsigned char byPktType, > > + void *pvCTS, > > + unsigned int cbFrameLength, > > + bool bNeedAck, > > + bool bDisCRC, > > + unsigned short wCurrentRate, > > + unsigned char byFBOption) > > { > > unsigned int uCTSFrameLen = 14; > > > > @@ -868,21 +844,17 @@ s_vFillCTSHead( > > - > > * unsigned int cbFrameSize, Hdr+Payload+FCS > > */ > > -static > > -void > > -s_vGenerateTxParameter( > > - struct vnt_private *pDevice, > > - unsigned char byPktType, > > - struct vnt_tx_fifo_head *tx_buffer_head, > > - void *pvRrvTime, > > - void *pvRTS, > > - void *pvCTS, > > - unsigned int cbFrameSize, > > - bool bNeedACK, > > - unsigned int uDMAIdx, > > - void *psEthHeader, > > - unsigned short wCurrentRate > > -) > > +static void s_vGenerateTxParameter(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + struct vnt_tx_fifo_head *tx_buffer_head, > > + void *pvRrvTime, > > + void *pvRTS, > > + void *pvCTS, > > + unsigned int cbFrameSize, > > + bool bNeedACK, > > + unsigned int uDMAIdx, > > + void *psEthHeader, > > + unsigned short wCurrentRate) > > { > > u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl); > > bool bDisCRC = false; > > @@ -954,11 +926,12 @@ s_vGenerateTxParameter( > > } > > } > > > > -static unsigned int > > -s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, > > - unsigned char *pbyTxBufferAddr, > > - unsigned int uDMAIdx, struct vnt_tx_desc *pHeadTD, > > - unsigned int is_pspoll) > > +static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + unsigned char *pbyTxBufferAddr, > > + unsigned int uDMAIdx, > > + struct vnt_tx_desc *pHeadTD, > > + unsigned int is_pspoll) > > { > > struct vnt_td_info *td_info = pHeadTD->td_info; > > struct sk_buff *skb = td_info->skb; > > Patch series coverletter is missing or the wrong one was send. > > Changelog is also missing. > oh the wrong cover letter was sent. thanks for pointing it out
On Fri, Oct 28, 2022 at 06:39:24AM +0000, Tanjuate Brunostar wrote: > fix several checkpatch errors related to lines ending with a '(' by > joining splitted lines of code and indenting properly to increase > visibility > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com> Hi Tanjuate, Thanks for your interest in the kernel community! The threading on the multiple versions of this patch series is unconventional. Please take a look at the archives of any mailing list, or the Outreachy mailing list archive. I don't expect a new version of the patch set to be sent as a reply to a prior version. Perhaps scale this back to a single patch to see if this kind of fix is going to be well received, and to work on your patch creation skills. Greg has pointed you to docs, and of course the First Patch Tutorial covers all of this too. Thanks, Alison > --- > drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- > 1 file changed, 69 insertions(+), 96 deletions(-) > > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c > index 1e5036121665..7eb7c6eb5cf0 100644 > --- a/drivers/staging/vt6655/rxtx.c > +++ b/drivers/staging/vt6655/rxtx.c > @@ -139,15 +139,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate) > * PK_TYPE_11GB 2 > * PK_TYPE_11GA 3 > */ > -static > -unsigned int > -s_uGetTxRsvTime( > - struct vnt_private *pDevice, > - unsigned char byPktType, > - unsigned int cbFrameLength, > - unsigned short wRate, > - bool bNeedAck > -) > +static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, > + unsigned char byPktType, > + unsigned int cbFrameLength, > + unsigned short wRate, > + bool bNeedAck) > { > unsigned int uDataTime, uAckTime; > > @@ -214,20 +210,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv, > } > > /* byFreqType 0: 5GHz, 1:2.4Ghz */ > -static > -unsigned int > -s_uGetDataDuration( > - struct vnt_private *pDevice, > - unsigned char byDurType, > - unsigned int cbFrameLength, > - unsigned char byPktType, > - unsigned short wRate, > - bool bNeedAck, > - unsigned int uFragIdx, > - unsigned int cbLastFragmentSize, > - unsigned int uMACfragNum, > - unsigned char byFBOption > -) > +static unsigned int s_uGetDataDuration(struct vnt_private *pDevice, > + unsigned char byDurType, > + unsigned int cbFrameLength, > + unsigned char byPktType, > + unsigned short wRate, > + bool bNeedAck, > + unsigned int uFragIdx, > + unsigned int cbLastFragmentSize, > + unsigned int uMACfragNum, > + unsigned char byFBOption) > { > bool bLastFrag = false; > unsigned int uAckTime = 0, uNextPktTime = 0, len; > @@ -316,17 +308,13 @@ s_uGetDataDuration( > } > > /* byFreqType: 0=>5GHZ 1=>2.4GHZ */ > -static > -__le16 > -s_uGetRTSCTSDuration( > - struct vnt_private *pDevice, > - unsigned char byDurType, > - unsigned int cbFrameLength, > - unsigned char byPktType, > - unsigned short wRate, > - bool bNeedAck, > - unsigned char byFBOption > -) > +static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice, > + unsigned char byDurType, > + unsigned int cbFrameLength, > + unsigned char byPktType, > + unsigned short wRate, > + bool bNeedAck, > + unsigned char byFBOption) > { > unsigned int uCTSTime = 0, uDurTime = 0; > > @@ -409,22 +397,18 @@ s_uGetRTSCTSDuration( > return cpu_to_le16((u16)uDurTime); > } > > -static > -__le16 > -s_uFillDataHead( > - struct vnt_private *pDevice, > - unsigned char byPktType, > - void *pTxDataHead, > - unsigned int cbFrameLength, > - unsigned int uDMAIdx, > - bool bNeedAck, > - unsigned int uFragIdx, > - unsigned int cbLastFragmentSize, > - unsigned int uMACfragNum, > - unsigned char byFBOption, > - unsigned short wCurrentRate, > - bool is_pspoll > -) > +static __le16 s_uFillDataHead(struct vnt_private *pDevice, > + unsigned char byPktType, > + void *pTxDataHead, > + unsigned int cbFrameLength, > + unsigned int uDMAIdx, > + bool bNeedAck, > + unsigned int uFragIdx, > + unsigned int cbLastFragmentSize, > + unsigned int uMACfragNum, > + unsigned char byFBOption, > + unsigned short wCurrentRate, > + bool is_pspoll) > { > struct vnt_tx_datahead_ab *buf = pTxDataHead; > > @@ -555,19 +539,15 @@ s_uFillDataHead( > return buf->duration; > } > > -static > -void > -s_vFillRTSHead( > - struct vnt_private *pDevice, > - unsigned char byPktType, > - void *pvRTS, > - unsigned int cbFrameLength, > - bool bNeedAck, > - bool bDisCRC, > - struct ieee80211_hdr *hdr, > - unsigned short wCurrentRate, > - unsigned char byFBOption > -) > +static void s_vFillRTSHead(struct vnt_private *pDevice, > + unsigned char byPktType, > + void *pvRTS, > + unsigned int cbFrameLength, > + bool bNeedAck, > + bool bDisCRC, > + struct ieee80211_hdr *hdr, > + unsigned short wCurrentRate, > + unsigned char byFBOption) > { > unsigned int uRTSFrameLen = 20; > > @@ -750,19 +730,15 @@ s_vFillRTSHead( > } > } > > -static > -void > -s_vFillCTSHead( > - struct vnt_private *pDevice, > - unsigned int uDMAIdx, > - unsigned char byPktType, > - void *pvCTS, > - unsigned int cbFrameLength, > - bool bNeedAck, > - bool bDisCRC, > - unsigned short wCurrentRate, > - unsigned char byFBOption > -) > +static void s_vFillCTSHead(struct vnt_private *pDevice, > + unsigned int uDMAIdx, > + unsigned char byPktType, > + void *pvCTS, > + unsigned int cbFrameLength, > + bool bNeedAck, > + bool bDisCRC, > + unsigned short wCurrentRate, > + unsigned char byFBOption) > { > unsigned int uCTSFrameLen = 14; > > @@ -868,21 +844,17 @@ s_vFillCTSHead( > - > * unsigned int cbFrameSize, Hdr+Payload+FCS > */ > -static > -void > -s_vGenerateTxParameter( > - struct vnt_private *pDevice, > - unsigned char byPktType, > - struct vnt_tx_fifo_head *tx_buffer_head, > - void *pvRrvTime, > - void *pvRTS, > - void *pvCTS, > - unsigned int cbFrameSize, > - bool bNeedACK, > - unsigned int uDMAIdx, > - void *psEthHeader, > - unsigned short wCurrentRate > -) > +static void s_vGenerateTxParameter(struct vnt_private *pDevice, > + unsigned char byPktType, > + struct vnt_tx_fifo_head *tx_buffer_head, > + void *pvRrvTime, > + void *pvRTS, > + void *pvCTS, > + unsigned int cbFrameSize, > + bool bNeedACK, > + unsigned int uDMAIdx, > + void *psEthHeader, > + unsigned short wCurrentRate) > { > u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl); > bool bDisCRC = false; > @@ -954,11 +926,12 @@ s_vGenerateTxParameter( > } > } > > -static unsigned int > -s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, > - unsigned char *pbyTxBufferAddr, > - unsigned int uDMAIdx, struct vnt_tx_desc *pHeadTD, > - unsigned int is_pspoll) > +static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, > + unsigned char byPktType, > + unsigned char *pbyTxBufferAddr, > + unsigned int uDMAIdx, > + struct vnt_tx_desc *pHeadTD, > + unsigned int is_pspoll) > { > struct vnt_td_info *td_info = pHeadTD->td_info; > struct sk_buff *skb = td_info->skb; > -- > 2.34.1 > >
On Fri, Oct 28, 2022 at 6:52 PM Alison Schofield <alison.schofield@intel.com> wrote: > > On Fri, Oct 28, 2022 at 06:39:24AM +0000, Tanjuate Brunostar wrote: > > fix several checkpatch errors related to lines ending with a '(' by > > joining splitted lines of code and indenting properly to increase > > visibility > > > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com> > > Hi Tanjuate, > > Thanks for your interest in the kernel community! > > The threading on the multiple versions of this patch series > is unconventional. Please take a look at the archives of > any mailing list, or the Outreachy mailing list archive. > I don't expect a new version of the patch set to be sent > as a reply to a prior version. > > Perhaps scale this back to a single patch to see if this > kind of fix is going to be well received, and to work on > your patch creation skills. > > Greg has pointed you to docs, and of course the First > Patch Tutorial covers all of this too. > > Thanks, > Alison > I do not get how this keeps happening. I think I am doing something wrong, even after going through the docs over and over again. I will take your advice and send just single patches for now. Thanks, Tanju > > > --- > > drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- > > 1 file changed, 69 insertions(+), 96 deletions(-) > > > > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c > > index 1e5036121665..7eb7c6eb5cf0 100644 > > --- a/drivers/staging/vt6655/rxtx.c > > +++ b/drivers/staging/vt6655/rxtx.c > > @@ -139,15 +139,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate) > > * PK_TYPE_11GB 2 > > * PK_TYPE_11GA 3 > > */ > > -static > > -unsigned int > > -s_uGetTxRsvTime( > > - struct vnt_private *pDevice, > > - unsigned char byPktType, > > - unsigned int cbFrameLength, > > - unsigned short wRate, > > - bool bNeedAck > > -) > > +static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + unsigned int cbFrameLength, > > + unsigned short wRate, > > + bool bNeedAck) > > { > > unsigned int uDataTime, uAckTime; > > > > @@ -214,20 +210,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv, > > } > > > > /* byFreqType 0: 5GHz, 1:2.4Ghz */ > > -static > > -unsigned int > > -s_uGetDataDuration( > > - struct vnt_private *pDevice, > > - unsigned char byDurType, > > - unsigned int cbFrameLength, > > - unsigned char byPktType, > > - unsigned short wRate, > > - bool bNeedAck, > > - unsigned int uFragIdx, > > - unsigned int cbLastFragmentSize, > > - unsigned int uMACfragNum, > > - unsigned char byFBOption > > -) > > +static unsigned int s_uGetDataDuration(struct vnt_private *pDevice, > > + unsigned char byDurType, > > + unsigned int cbFrameLength, > > + unsigned char byPktType, > > + unsigned short wRate, > > + bool bNeedAck, > > + unsigned int uFragIdx, > > + unsigned int cbLastFragmentSize, > > + unsigned int uMACfragNum, > > + unsigned char byFBOption) > > { > > bool bLastFrag = false; > > unsigned int uAckTime = 0, uNextPktTime = 0, len; > > @@ -316,17 +308,13 @@ s_uGetDataDuration( > > } > > > > /* byFreqType: 0=>5GHZ 1=>2.4GHZ */ > > -static > > -__le16 > > -s_uGetRTSCTSDuration( > > - struct vnt_private *pDevice, > > - unsigned char byDurType, > > - unsigned int cbFrameLength, > > - unsigned char byPktType, > > - unsigned short wRate, > > - bool bNeedAck, > > - unsigned char byFBOption > > -) > > +static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice, > > + unsigned char byDurType, > > + unsigned int cbFrameLength, > > + unsigned char byPktType, > > + unsigned short wRate, > > + bool bNeedAck, > > + unsigned char byFBOption) > > { > > unsigned int uCTSTime = 0, uDurTime = 0; > > > > @@ -409,22 +397,18 @@ s_uGetRTSCTSDuration( > > return cpu_to_le16((u16)uDurTime); > > } > > > > -static > > -__le16 > > -s_uFillDataHead( > > - struct vnt_private *pDevice, > > - unsigned char byPktType, > > - void *pTxDataHead, > > - unsigned int cbFrameLength, > > - unsigned int uDMAIdx, > > - bool bNeedAck, > > - unsigned int uFragIdx, > > - unsigned int cbLastFragmentSize, > > - unsigned int uMACfragNum, > > - unsigned char byFBOption, > > - unsigned short wCurrentRate, > > - bool is_pspoll > > -) > > +static __le16 s_uFillDataHead(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + void *pTxDataHead, > > + unsigned int cbFrameLength, > > + unsigned int uDMAIdx, > > + bool bNeedAck, > > + unsigned int uFragIdx, > > + unsigned int cbLastFragmentSize, > > + unsigned int uMACfragNum, > > + unsigned char byFBOption, > > + unsigned short wCurrentRate, > > + bool is_pspoll) > > { > > struct vnt_tx_datahead_ab *buf = pTxDataHead; > > > > @@ -555,19 +539,15 @@ s_uFillDataHead( > > return buf->duration; > > } > > > > -static > > -void > > -s_vFillRTSHead( > > - struct vnt_private *pDevice, > > - unsigned char byPktType, > > - void *pvRTS, > > - unsigned int cbFrameLength, > > - bool bNeedAck, > > - bool bDisCRC, > > - struct ieee80211_hdr *hdr, > > - unsigned short wCurrentRate, > > - unsigned char byFBOption > > -) > > +static void s_vFillRTSHead(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + void *pvRTS, > > + unsigned int cbFrameLength, > > + bool bNeedAck, > > + bool bDisCRC, > > + struct ieee80211_hdr *hdr, > > + unsigned short wCurrentRate, > > + unsigned char byFBOption) > > { > > unsigned int uRTSFrameLen = 20; > > > > @@ -750,19 +730,15 @@ s_vFillRTSHead( > > } > > } > > > > -static > > -void > > -s_vFillCTSHead( > > - struct vnt_private *pDevice, > > - unsigned int uDMAIdx, > > - unsigned char byPktType, > > - void *pvCTS, > > - unsigned int cbFrameLength, > > - bool bNeedAck, > > - bool bDisCRC, > > - unsigned short wCurrentRate, > > - unsigned char byFBOption > > -) > > +static void s_vFillCTSHead(struct vnt_private *pDevice, > > + unsigned int uDMAIdx, > > + unsigned char byPktType, > > + void *pvCTS, > > + unsigned int cbFrameLength, > > + bool bNeedAck, > > + bool bDisCRC, > > + unsigned short wCurrentRate, > > + unsigned char byFBOption) > > { > > unsigned int uCTSFrameLen = 14; > > > > @@ -868,21 +844,17 @@ s_vFillCTSHead( > > - > > * unsigned int cbFrameSize, Hdr+Payload+FCS > > */ > > -static > > -void > > -s_vGenerateTxParameter( > > - struct vnt_private *pDevice, > > - unsigned char byPktType, > > - struct vnt_tx_fifo_head *tx_buffer_head, > > - void *pvRrvTime, > > - void *pvRTS, > > - void *pvCTS, > > - unsigned int cbFrameSize, > > - bool bNeedACK, > > - unsigned int uDMAIdx, > > - void *psEthHeader, > > - unsigned short wCurrentRate > > -) > > +static void s_vGenerateTxParameter(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + struct vnt_tx_fifo_head *tx_buffer_head, > > + void *pvRrvTime, > > + void *pvRTS, > > + void *pvCTS, > > + unsigned int cbFrameSize, > > + bool bNeedACK, > > + unsigned int uDMAIdx, > > + void *psEthHeader, > > + unsigned short wCurrentRate) > > { > > u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl); > > bool bDisCRC = false; > > @@ -954,11 +926,12 @@ s_vGenerateTxParameter( > > } > > } > > > > -static unsigned int > > -s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, > > - unsigned char *pbyTxBufferAddr, > > - unsigned int uDMAIdx, struct vnt_tx_desc *pHeadTD, > > - unsigned int is_pspoll) > > +static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, > > + unsigned char byPktType, > > + unsigned char *pbyTxBufferAddr, > > + unsigned int uDMAIdx, > > + struct vnt_tx_desc *pHeadTD, > > + unsigned int is_pspoll) > > { > > struct vnt_td_info *td_info = pHeadTD->td_info; > > struct sk_buff *skb = td_info->skb; > > -- > > 2.34.1 > > > >
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 1e5036121665..7eb7c6eb5cf0 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -139,15 +139,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate) * PK_TYPE_11GB 2 * PK_TYPE_11GA 3 */ -static -unsigned int -s_uGetTxRsvTime( - struct vnt_private *pDevice, - unsigned char byPktType, - unsigned int cbFrameLength, - unsigned short wRate, - bool bNeedAck -) +static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, + unsigned char byPktType, + unsigned int cbFrameLength, + unsigned short wRate, + bool bNeedAck) { unsigned int uDataTime, uAckTime; @@ -214,20 +210,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv, } /* byFreqType 0: 5GHz, 1:2.4Ghz */ -static -unsigned int -s_uGetDataDuration( - struct vnt_private *pDevice, - unsigned char byDurType, - unsigned int cbFrameLength, - unsigned char byPktType, - unsigned short wRate, - bool bNeedAck, - unsigned int uFragIdx, - unsigned int cbLastFragmentSize, - unsigned int uMACfragNum, - unsigned char byFBOption -) +static unsigned int s_uGetDataDuration(struct vnt_private *pDevice, + unsigned char byDurType, + unsigned int cbFrameLength, + unsigned char byPktType, + unsigned short wRate, + bool bNeedAck, + unsigned int uFragIdx, + unsigned int cbLastFragmentSize, + unsigned int uMACfragNum, + unsigned char byFBOption) { bool bLastFrag = false; unsigned int uAckTime = 0, uNextPktTime = 0, len; @@ -316,17 +308,13 @@ s_uGetDataDuration( } /* byFreqType: 0=>5GHZ 1=>2.4GHZ */ -static -__le16 -s_uGetRTSCTSDuration( - struct vnt_private *pDevice, - unsigned char byDurType, - unsigned int cbFrameLength, - unsigned char byPktType, - unsigned short wRate, - bool bNeedAck, - unsigned char byFBOption -) +static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice, + unsigned char byDurType, + unsigned int cbFrameLength, + unsigned char byPktType, + unsigned short wRate, + bool bNeedAck, + unsigned char byFBOption) { unsigned int uCTSTime = 0, uDurTime = 0; @@ -409,22 +397,18 @@ s_uGetRTSCTSDuration( return cpu_to_le16((u16)uDurTime); } -static -__le16 -s_uFillDataHead( - struct vnt_private *pDevice, - unsigned char byPktType, - void *pTxDataHead, - unsigned int cbFrameLength, - unsigned int uDMAIdx, - bool bNeedAck, - unsigned int uFragIdx, - unsigned int cbLastFragmentSize, - unsigned int uMACfragNum, - unsigned char byFBOption, - unsigned short wCurrentRate, - bool is_pspoll -) +static __le16 s_uFillDataHead(struct vnt_private *pDevice, + unsigned char byPktType, + void *pTxDataHead, + unsigned int cbFrameLength, + unsigned int uDMAIdx, + bool bNeedAck, + unsigned int uFragIdx, + unsigned int cbLastFragmentSize, + unsigned int uMACfragNum, + unsigned char byFBOption, + unsigned short wCurrentRate, + bool is_pspoll) { struct vnt_tx_datahead_ab *buf = pTxDataHead; @@ -555,19 +539,15 @@ s_uFillDataHead( return buf->duration; } -static -void -s_vFillRTSHead( - struct vnt_private *pDevice, - unsigned char byPktType, - void *pvRTS, - unsigned int cbFrameLength, - bool bNeedAck, - bool bDisCRC, - struct ieee80211_hdr *hdr, - unsigned short wCurrentRate, - unsigned char byFBOption -) +static void s_vFillRTSHead(struct vnt_private *pDevice, + unsigned char byPktType, + void *pvRTS, + unsigned int cbFrameLength, + bool bNeedAck, + bool bDisCRC, + struct ieee80211_hdr *hdr, + unsigned short wCurrentRate, + unsigned char byFBOption) { unsigned int uRTSFrameLen = 20; @@ -750,19 +730,15 @@ s_vFillRTSHead( } } -static -void -s_vFillCTSHead( - struct vnt_private *pDevice, - unsigned int uDMAIdx, - unsigned char byPktType, - void *pvCTS, - unsigned int cbFrameLength, - bool bNeedAck, - bool bDisCRC, - unsigned short wCurrentRate, - unsigned char byFBOption -) +static void s_vFillCTSHead(struct vnt_private *pDevice, + unsigned int uDMAIdx, + unsigned char byPktType, + void *pvCTS, + unsigned int cbFrameLength, + bool bNeedAck, + bool bDisCRC, + unsigned short wCurrentRate, + unsigned char byFBOption) { unsigned int uCTSFrameLen = 14; @@ -868,21 +844,17 @@ s_vFillCTSHead( - * unsigned int cbFrameSize, Hdr+Payload+FCS */ -static -void -s_vGenerateTxParameter( - struct vnt_private *pDevice, - unsigned char byPktType, - struct vnt_tx_fifo_head *tx_buffer_head, - void *pvRrvTime, - void *pvRTS, - void *pvCTS, - unsigned int cbFrameSize, - bool bNeedACK, - unsigned int uDMAIdx, - void *psEthHeader, - unsigned short wCurrentRate -) +static void s_vGenerateTxParameter(struct vnt_private *pDevice, + unsigned char byPktType, + struct vnt_tx_fifo_head *tx_buffer_head, + void *pvRrvTime, + void *pvRTS, + void *pvCTS, + unsigned int cbFrameSize, + bool bNeedACK, + unsigned int uDMAIdx, + void *psEthHeader, + unsigned short wCurrentRate) { u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl); bool bDisCRC = false; @@ -954,11 +926,12 @@ s_vGenerateTxParameter( } } -static unsigned int -s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, - unsigned char *pbyTxBufferAddr, - unsigned int uDMAIdx, struct vnt_tx_desc *pHeadTD, - unsigned int is_pspoll) +static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, + unsigned char byPktType, + unsigned char *pbyTxBufferAddr, + unsigned int uDMAIdx, + struct vnt_tx_desc *pHeadTD, + unsigned int is_pspoll) { struct vnt_td_info *td_info = pHeadTD->td_info; struct sk_buff *skb = td_info->skb;