staging: vt6655: a series of checkpatch fixes on the file: rxtx.c
v5 cover staging: vt6655: a series of checkpatch fixes on the file: rxtx.c
The fixes are similar, mostly long lines splitting. I had to make serveral patches to ease the work of inspectors
v2: fixed a compilation error found by the kernel test robot and recompiled the code
v3: tends out the error persisted in the second version. this version is a correction of that
v4: did some corrections as recommended by Greg KH
v5: shortend changelog comments as recommended by Greg KH
Tanjuate Brunostar (6):
staging: vt6655: fix lines ending in a '('
staging: vt6655: refactor code in s_uGetRTSCTSDuration
staging: vt6655: refactor code in s_uFillDataHead
staging: vt6655: refactor code in s_vGenerateTxParamete
staging: vt6655: refactor code in the rest of the file
staging: vt6655: refactor code to avoid a line ending in '('
drivers/staging/vt6655/rxtx.c | 542 ++++++++++++++++++++-------------- 1 file changed, 324 insertions(+), 218 deletions(-)
Signature · 1 line
2.34.1
PATCH v5 1/6 staging: vt6655: fix lines ending in a '('
fix serveral checkpatch errors related to lines ending with a '(' by refactoring the code lines
Signed-off-by Tanjuate Brunostar <[email protected]>
--- drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- 1 file changed, 69 insertions(+), 96 deletions(-)
drivers/staging/vt6655/rxtx.c +69 -96
@@ -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;
Signature · 1 line
2.34.1
Greg KH
maintainerRe: [PATCH v5 1/6] staging: vt6655: fix lines ending in a '('
Quoted 2 lines · Tanjuate Brunostar
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
Re: [PATCH v6 1/6] staging: vt6655: fix lines ending in a '('
In reply to Tanjuate BrunostarQuoted 2 lines · Tanjuate Brunostar
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
^^^^^^^^
Re: [PATCH v7 1/6] staging: vt6655: fix lines of code ending in a '('
In reply to Tanjuate BrunostarQuoted 224 lines · Tanjuate Brunostar
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 <[email protected]>--- drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- 1 file changed, 69 insertions(+), 96 deletions(-)drivers/staging/vt6655/rxtx.c +63
-95@@ -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,
drivers/staging/vt6655/rxtx.c s_vGenerateTxParameter( · line 937
Quoted 10 lines
drivers/staging/vt6655/rxtx.c +6
-1- 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.
Re: [PATCH v7 1/6] staging: vt6655: fix lines of code ending in a '('
Quoted 239 lines · Philipp Hortmann
Quoted 224 lines · Tanjuate Brunostar
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 <[email protected]>--- drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- 1 file changed, 69 insertions(+), 96 deletions(-)drivers/staging/vt6655/rxtx.c +63
-95@@ -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,drivers/staging/vt6655/rxtx.c s_vGenerateTxParameter( · line 937
Quoted 10 lines
drivers/staging/vt6655/rxtx.c +6
-1- 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.
Quoted 2 lines
Changelog is also missing.
oh the wrong cover letter was sent.
thanks for pointing it out
Re: [PATCH v7 1/6] staging: vt6655: fix lines of code ending in a '('
In reply to Tanjuate BrunostarQuoted 5 lines · Tanjuate Brunostar
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 <[email protected]>
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
Quoted 233 lines
--- drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- 1 file changed, 69 insertions(+), 96 deletions(-)drivers/staging/vt6655/rxtx.c +69
-96@@ -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;Signature · 1 line
2.34.1
Re: [PATCH v7 1/6] staging: vt6655: fix lines of code ending in a '('
Quoted 22 lines · Alison Schofield
Quoted 5 lines · Tanjuate Brunostar
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 <[email protected]>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.
Quoted 6 lines
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
Quoted 234 lines
Quoted 234 lines
--- drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++-------------------- 1 file changed, 69 insertions(+), 96 deletions(-)drivers/staging/vt6655/rxtx.c +69
-97@@ -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
PATCH v5 2/6 staging: vt6655: refactor code in s_uGetRTSCTSDuration
In reply to Tanjuate Brunostarfix checkpatch errors by refactoring long lines of code in the function: s_uGetRTSCTSDuration
Signed-off-by Tanjuate Brunostar <[email protected]>
--- drivers/staging/vt6655/rxtx.c | 108 ++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 32 deletions(-)
drivers/staging/vt6655/rxtx.c +76 -32
@@ -186,20 +186,29 @@ static __le16 get_rtscts_time(struct vnt_private *priv, data_time =bb_get_frame_time (priv->preamble_type, pkt_type, frame_length, current_rate);if (rts_rsvtype ==0 ) {/* RTSTxRrvTime_bb */ - rts_time =bb_get_frame_time (priv->preamble_type, pkt_type,20 , priv->byTopCCKBasicRate); - ack_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , priv->byTopCCKBasicRate); + rts_time =bb_get_frame_time (priv->preamble_type, pkt_type,20 , + priv->byTopCCKBasicRate); + ack_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , + priv->byTopCCKBasicRate); cts_time = ack_time; }else if (rts_rsvtype ==1 ) {/* RTSTxRrvTime_ba, only in 2.4GHZ */ - rts_time =bb_get_frame_time (priv->preamble_type, pkt_type,20 , priv->byTopCCKBasicRate); - cts_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , priv->byTopCCKBasicRate); - ack_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , priv->byTopOFDMBasicRate); + rts_time =bb_get_frame_time (priv->preamble_type, pkt_type,20 , + priv->byTopCCKBasicRate); + cts_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , + priv->byTopCCKBasicRate); + ack_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , + priv->byTopOFDMBasicRate); }else if (rts_rsvtype ==2 ) {/* RTSTxRrvTime_aa */ - rts_time =bb_get_frame_time (priv->preamble_type, pkt_type,20 , priv->byTopOFDMBasicRate); - ack_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , priv->byTopOFDMBasicRate); + rts_time =bb_get_frame_time (priv->preamble_type, pkt_type,20 , + priv->byTopOFDMBasicRate); + ack_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , + priv->byTopOFDMBasicRate); cts_time = ack_time; }else if (rts_rsvtype ==3 ) {/* CTSTxRrvTime_ba, only in 2.4GHZ */ - cts_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , priv->byTopCCKBasicRate); - ack_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , priv->byTopOFDMBasicRate); + cts_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , + priv->byTopCCKBasicRate); + ack_time =bb_get_frame_time (priv->preamble_type, pkt_type,14 , + priv->byTopOFDMBasicRate); rrv_time = cts_time + ack_time + data_time +2 * priv->uSIFS;return cpu_to_le16 ((u16 )rrv_time); }
@@ -320,73 +329,108 @@ static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice,switch (byDurType) {case RTSDUR_BB :/* RTSDuration_bb */ - uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , pDevice->byTopCCKBasicRate); - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck); + uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , + pDevice->byTopCCKBasicRate); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck);break ;case RTSDUR_BA :/* RTSDuration_ba */ - uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , pDevice->byTopCCKBasicRate); - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck); + uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , + pDevice->byTopCCKBasicRate); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck);break ;case RTSDUR_AA :/* RTSDuration_aa */ - uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , pDevice->byTopOFDMBasicRate); - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck); + uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , + pDevice->byTopOFDMBasicRate); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck);break ;case CTSDUR_BA :/* CTSDuration_ba */ - uDurTime = pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck); + uDurTime = pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, + cbFrameLength, wRate, bNeedAck);break ;case RTSDUR_BA_F0 :/* RTSDuration_ba_f0 */ - uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , pDevice->byTopCCKBasicRate); + uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , + pDevice->byTopCCKBasicRate);if ((byFBOption ==AUTO_FB_0 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0 ][wRate -RATE_18M ], bNeedAck); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt0[FB_RATE0 ][wRate -RATE_18M ], bNeedAck);else if ((byFBOption ==AUTO_FB_1 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0 ][wRate -RATE_18M ], bNeedAck); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt1[FB_RATE0 ][wRate -RATE_18M ], bNeedAck);break ;case RTSDUR_AA_F0 :/* RTSDuration_aa_f0 */ - uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , pDevice->byTopOFDMBasicRate); + uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , + pDevice->byTopOFDMBasicRate);if ((byFBOption ==AUTO_FB_0 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0 ][wRate -RATE_18M ], bNeedAck); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt0[FB_RATE0 ][wRate -RATE_18M ], bNeedAck);else if ((byFBOption ==AUTO_FB_1 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0 ][wRate -RATE_18M ], bNeedAck); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt1[FB_RATE0 ][wRate -RATE_18M ], bNeedAck);break ;case RTSDUR_BA_F1 :/* RTSDuration_ba_f1 */ - uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , pDevice->byTopCCKBasicRate); + uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , + pDevice->byTopCCKBasicRate);if ((byFBOption ==AUTO_FB_0 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1 ][wRate -RATE_18M ], bNeedAck); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt0[FB_RATE1 ][wRate -RATE_18M ], bNeedAck);else if ((byFBOption ==AUTO_FB_1 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1 ][wRate -RATE_18M ], bNeedAck); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt1[FB_RATE1 ][wRate -RATE_18M ], bNeedAck);break ;case RTSDUR_AA_F1 :/* RTSDuration_aa_f1 */ - uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , pDevice->byTopOFDMBasicRate); + uCTSTime =bb_get_frame_time (pDevice->preamble_type, byPktType,14 , + pDevice->byTopOFDMBasicRate);if ((byFBOption ==AUTO_FB_0 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1 ][wRate -RATE_18M ], bNeedAck); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt0[FB_RATE1 ][wRate -RATE_18M ], bNeedAck);else if ((byFBOption ==AUTO_FB_1 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = uCTSTime +2 * pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1 ][wRate -RATE_18M ], bNeedAck); + uDurTime = uCTSTime +2 * pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt1[FB_RATE1 ][wRate -RATE_18M ], bNeedAck);break ;case CTSDUR_BA_F0 :/* CTSDuration_ba_f0 */ if ((byFBOption ==AUTO_FB_0 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0 ][wRate -RATE_18M ], bNeedAck); + uDurTime = pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt0[FB_RATE0 ][wRate -RATE_18M ], bNeedAck);else if ((byFBOption ==AUTO_FB_1 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0 ][wRate -RATE_18M ], bNeedAck); + uDurTime = pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt1[FB_RATE0 ][wRate -RATE_18M ], bNeedAck);break ;case CTSDUR_BA_F1 :/* CTSDuration_ba_f1 */ if ((byFBOption ==AUTO_FB_0 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1 ][wRate -RATE_18M ], bNeedAck); + uDurTime = pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt0[FB_RATE1 ][wRate -RATE_18M ], bNeedAck);else if ((byFBOption ==AUTO_FB_1 ) && (wRate >=RATE_18M ) && (wRate <=RATE_54M )) - uDurTime = pDevice->uSIFS +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1 ][wRate -RATE_18M ], bNeedAck); + uDurTime = pDevice->uSIFS + +s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, + wFB_Opt1[FB_RATE1 ][wRate -RATE_18M ], bNeedAck);break ;
Signature · 1 line
2.34.1
Greg KH
maintainerRe: [PATCH v5 2/6] staging: vt6655: refactor code in s_uGetRTSCTSDuration
Quoted 1 line · Tanjuate Brunostar
fix checkpatch errors by refactoring long lines of code in the function:
s_uGetRTSCTSDuration
Um, this is 93 characters long.
I don't see it changed from before :(
Please fix _ALL_ changelog texts...
greg k-h
Greg KH
maintainerRe: [PATCH v5 2/6] staging: vt6655: refactor code in s_uGetRTSCTSDuration
In reply to Tanjuate BrunostarQuoted 1 line · Tanjuate Brunostar
refactor long lines of code in the function:
s_uGetRTSCTSDuration
Please write full sentences.
Also please read the in-kernel documentation for how to write good changelog text. Specifically look at the section entitled "The canonical patch format" in the kernel file, Documentation/SubmittingPatches for a description of how to do this properly.
Do this for all of the patches in this series.
thanks,
greg k-h
Re: [PATCH v5 2/6] staging: vt6655: refactor code in s_uGetRTSCTSDuration
Quoted 12 lines · Greg KH
Quoted 1 line · Tanjuate Brunostar
refactor long lines of code in the function:
s_uGetRTSCTSDurationPlease write full sentences.
Also please read the in-kernel documentation for how to write good changelog text. Specifically look at the section entitled "The canonical patch format" in the kernel file,
Documentation/SubmittingPatchesfor a description of how to do this properly.
Quoted 5 lines
Do this for all of the patches in this series.
thanks,
greg k-h
Hello Greg
the file does not exist in Documentations
Also, I had to make the sentences shorter because you said changelog text was too long. Can you please give an example of a good changelog text? I feel like I have not understood you.
thanks
Tanju
Greg KH
maintainerRe: [PATCH v5 2/6] staging: vt6655: refactor code in s_uGetRTSCTSDuration
Quoted 13 lines · Tanju Brunostar
Quoted 12 lines · Greg KH
Quoted 1 line · Tanjuate Brunostar
refactor long lines of code in the function:
s_uGetRTSCTSDurationPlease write full sentences.
Also please read the in-kernel documentation for how to write good changelog text. Specifically look at the section entitled "The canonical patch format" in the kernel file,
Documentation/SubmittingPatchesfor a description of how to do this properly.
Quoted 8 lines
Quoted 5 lines
Do this for all of the patches in this series.
thanks,
greg k-h
Hello Greg
the file does not exist in Documentations
$ cat Documentation/SubmittingPatches This file has moved to process/submitting-patches.rst
Quoted 2 lines
Also, I had to make the sentences shorter because you said changelog text was too long.
You had too long of a single line. Wrap your lines.
Look at all of the changelogs for the driver itself as examples.
thanks,
greg k-h
PATCH v5 3/6 staging: vt6655: refactor code in s_uFillDataHead
In reply to Tanjuate Brunostarfix checkpatch errors by refactoring long lines of code in the function: s_uFillDataHead
Signed-off-by Tanjuate Brunostar <[email protected]>
--- drivers/staging/vt6655/rxtx.c | 97 ++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 30 deletions(-)
drivers/staging/vt6655/rxtx.c +67 -30
@@ -481,19 +481,28 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice, }else {/* Get Duration and TimeStamp */ buf->duration_a = -cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A , cbFrameLength, - byPktType, wCurrentRate, bNeedAck, uFragIdx, - cbLastFragmentSize, uMACfragNum, +cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A , + cbFrameLength, + byPktType, + wCurrentRate, bNeedAck, + uFragIdx, + cbLastFragmentSize, + uMACfragNum, byFBOption)); buf->duration_b = -cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_B , cbFrameLength, -PK_TYPE_11B , pDevice->byTopCCKBasicRate, - bNeedAck, uFragIdx, cbLastFragmentSize, - uMACfragNum, byFBOption)); +cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_B , + cbFrameLength, +PK_TYPE_11B , + pDevice->byTopCCKBasicRate, + bNeedAck, uFragIdx, + cbLastFragmentSize, + uMACfragNum, + byFBOption)); } buf->time_stamp_off_a =vnt_time_stamp_off (pDevice, wCurrentRate); - buf->time_stamp_off_b =vnt_time_stamp_off (pDevice, pDevice->byTopCCKBasicRate); + buf->time_stamp_off_b =vnt_time_stamp_off (pDevice, + pDevice->byTopCCKBasicRate);return buf->duration_a; }
@@ -506,14 +515,29 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice, pDevice->byTopCCKBasicRate, PK_TYPE_11B, &buf->b);/* Get Duration and TimeStamp */ - buf->duration_a =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A , cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_b =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_B , cbFrameLength,PK_TYPE_11B , - pDevice->byTopCCKBasicRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_a_f0 =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A_F0 , cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_a_f1 =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A_F1 , cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); + buf->duration_a =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A , + cbFrameLength, byPktType, + wCurrentRate, bNeedAck, + uFragIdx, cbLastFragmentSize, + uMACfragNum, byFBOption)); + buf->duration_b =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_B , + cbFrameLength,PK_TYPE_11B , + pDevice->byTopCCKBasicRate, + bNeedAck, uFragIdx, + cbLastFragmentSize, + uMACfragNum, byFBOption)); + buf->duration_a_f0 =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A_F0 , + cbFrameLength, byPktType, + wCurrentRate, bNeedAck, + uFragIdx, + cbLastFragmentSize, + uMACfragNum, byFBOption)); + buf->duration_a_f1 =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A_F1 , + cbFrameLength, byPktType, + wCurrentRate, bNeedAck, + uFragIdx, + cbLastFragmentSize, + uMACfragNum, byFBOption)); buf->time_stamp_off_a =vnt_time_stamp_off (pDevice, wCurrentRate); buf->time_stamp_off_b =vnt_time_stamp_off (pDevice, pDevice->byTopCCKBasicRate);
@@ -531,12 +555,24 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice, byPktType, &buf->a);/* Get Duration and TimeStampOff */ - buf->duration =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A , cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_f0 =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A_F0 , cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); - buf->duration_f1 =cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A_F1 , cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); + buf->duration = +cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A , + cbFrameLength, byPktType, + wCurrentRate, bNeedAck, + uFragIdx, cbLastFragmentSize, + uMACfragNum, byFBOption)); + buf->duration_f0 = +cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A_F0 , + cbFrameLength, byPktType, + wCurrentRate, bNeedAck, + uFragIdx, cbLastFragmentSize, + uMACfragNum, byFBOption)); + buf->duration_f1 = +cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A_F1 , + cbFrameLength, byPktType, + wCurrentRate, bNeedAck, + uFragIdx, cbLastFragmentSize, + uMACfragNum, byFBOption)); buf->time_stamp_off =vnt_time_stamp_off (pDevice, wCurrentRate);return buf->duration; }
@@ -552,10 +588,11 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice, }else {/* Get Duration and TimeStampOff */ buf->duration = -cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A , cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, - cbLastFragmentSize, uMACfragNum, - byFBOption)); +cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_A , + cbFrameLength, byPktType, + wCurrentRate, bNeedAck, + uFragIdx, cbLastFragmentSize, + uMACfragNum, byFBOption)); } buf->time_stamp_off =vnt_time_stamp_off (pDevice, wCurrentRate);
@@ -573,10 +610,10 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice, }else {/* Get Duration and TimeStampOff */ buf->duration = -cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_B , cbFrameLength, byPktType, - wCurrentRate, bNeedAck, uFragIdx, - cbLastFragmentSize, uMACfragNum, - byFBOption)); +cpu_to_le16 ((u16 )s_uGetDataDuration (pDevice,DATADUR_B , cbFrameLength, + byPktType, wCurrentRate, bNeedAck, + uFragIdx, cbLastFragmentSize, + uMACfragNum, byFBOption)); } buf->time_stamp_off =vnt_time_stamp_off (pDevice, wCurrentRate);
Signature · 1 line
2.34.1
PATCH v5 4/6 staging: vt6655: refactor code in s_vGenerateTxParameter
In reply to Tanjuate Brunostarfix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter
Signed-off-by Tanjuate Brunostar <[email protected]>
--- drivers/staging/vt6655/rxtx.c | 68 ++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 21 deletions(-)
drivers/staging/vt6655/rxtx.c +47 -21
@@ -834,7 +834,9 @@ static void 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 */
@@ -873,7 +875,11 @@ static void 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,
@@ -959,50 +965,70 @@ 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; - 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); } } }
Signature · 1 line
2.34.1
PATCH v5 5/6 staging: vt6655: refactor code in the rest of the file
In reply to Tanjuate Brunostarfix checkpatch errors by refactoring long lines of code in the rest of the file
Signed-off-by Tanjuate Brunostar <[email protected]>
--- drivers/staging/vt6655/rxtx.c | 86 +++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 29 deletions(-)
drivers/staging/vt6655/rxtx.c +57 -29
@@ -1102,44 +1102,59 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice,if (byFBOption ==AUTO_FB_NONE ) {if (bRTS) {/* RTS_need */ pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize); - pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_rts )); - pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_rts ) + cbMICHDR); + pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_rts )); + pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_rts ) + cbMICHDR); pvCTS =NULL ; - pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_rts ) + - cbMICHDR +sizeof (struct vnt_rts_g )); + pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_rts ) + + cbMICHDR +sizeof (struct vnt_rts_g )); cbHeaderLength = wTxBufSize +sizeof (struct vnt_rrv_time_rts ) + cbMICHDR +sizeof (struct vnt_rts_g ) +sizeof (struct vnt_tx_datahead_g ); }else {/* RTS_needless */ pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize); - pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_cts )); + pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_cts )); pvRTS =NULL ; - pvCTS = (void *) (pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_cts ) + cbMICHDR); + pvCTS = (void *) (pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_cts ) + cbMICHDR); pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + -sizeof (struct vnt_rrv_time_cts ) + cbMICHDR +sizeof (struct vnt_cts )); +sizeof (struct vnt_rrv_time_cts ) + cbMICHDR + +sizeof (struct vnt_cts )); cbHeaderLength = wTxBufSize +sizeof (struct vnt_rrv_time_cts ) + - cbMICHDR +sizeof (struct vnt_cts ) +sizeof (struct vnt_tx_datahead_g ); + cbMICHDR +sizeof (struct vnt_cts ) + +sizeof (struct vnt_tx_datahead_g ); } }else {/* Auto Fall Back */ if (bRTS) {/* RTS_need */ pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize); - pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_rts )); - pvRTS = (void *) (pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_rts ) + cbMICHDR); + pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_rts )); + pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_rts ) + cbMICHDR); pvCTS =NULL ; - pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_rts ) + + pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_rts ) + cbMICHDR +sizeof (struct vnt_rts_g_fb )); cbHeaderLength = wTxBufSize +sizeof (struct vnt_rrv_time_rts ) + - cbMICHDR +sizeof (struct vnt_rts_g_fb ) +sizeof (struct vnt_tx_datahead_g_fb ); + cbMICHDR +sizeof (struct vnt_rts_g_fb ) + +sizeof (struct vnt_tx_datahead_g_fb ); }else {/* RTS_needless */ pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize); - pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_cts )); + pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_cts )); pvRTS =NULL ; - pvCTS = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_cts ) + cbMICHDR); - pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_cts ) + + pvCTS = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_cts ) + cbMICHDR); + pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_cts ) + cbMICHDR +sizeof (struct vnt_cts_fb )); cbHeaderLength = wTxBufSize +sizeof (struct vnt_rrv_time_cts ) + - cbMICHDR +sizeof (struct vnt_cts_fb ) +sizeof (struct vnt_tx_datahead_g_fb ); + cbMICHDR +sizeof (struct vnt_cts_fb ) + +sizeof (struct vnt_tx_datahead_g_fb ); } }/* Auto Fall Back */ }else {/* 802.11a/b packet */
@@ -1147,19 +1162,25 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice,if (byFBOption ==AUTO_FB_NONE ) {if (bRTS) { pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize); - pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_ab )); - pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR); + pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_ab )); + pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR); pvCTS =NULL ; pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + -sizeof (struct vnt_rrv_time_ab ) + cbMICHDR +sizeof (struct vnt_rts_ab )); +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR + +sizeof (struct vnt_rts_ab )); cbHeaderLength = wTxBufSize +sizeof (struct vnt_rrv_time_ab ) + - cbMICHDR +sizeof (struct vnt_rts_ab ) +sizeof (struct vnt_tx_datahead_ab ); + cbMICHDR +sizeof (struct vnt_rts_ab ) + +sizeof (struct vnt_tx_datahead_ab ); }else {/* RTS_needless, need MICHDR */ pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize); - pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_ab )); + pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_ab )); pvRTS =NULL ; pvCTS =NULL ; - pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR); + pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR); cbHeaderLength = wTxBufSize +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR +sizeof (struct vnt_tx_datahead_ab ); }
@@ -1167,19 +1188,25 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice,/* Auto Fall Back */ if (bRTS) {/* RTS_need */ pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize); - pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_ab )); - pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR); + pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_ab )); + pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR); pvCTS =NULL ; pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + -sizeof (struct vnt_rrv_time_ab ) + cbMICHDR +sizeof (struct vnt_rts_a_fb )); +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR + +sizeof (struct vnt_rts_a_fb )); cbHeaderLength = wTxBufSize +sizeof (struct vnt_rrv_time_ab ) + - cbMICHDR +sizeof (struct vnt_rts_a_fb ) +sizeof (struct vnt_tx_datahead_a_fb ); + cbMICHDR +sizeof (struct vnt_rts_a_fb ) + +sizeof (struct vnt_tx_datahead_a_fb ); }else {/* RTS_needless */ pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize); - pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_ab )); + pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_ab )); pvRTS =NULL ; pvCTS =NULL ; - pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR); + pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR); cbHeaderLength = wTxBufSize +sizeof (struct vnt_rrv_time_ab ) + cbMICHDR +sizeof (struct vnt_tx_datahead_a_fb ); }
@@ -1195,7 +1222,8 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, cbFrameSize, bNeedACK, uDMAIdx, hdr, pDevice->wCurrentRate);/* Fill DataHead */ uDuration =s_uFillDataHead (pDevice, byPktType, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK, -0 ,0 , uMACfragNum, byFBOption, pDevice->wCurrentRate, is_pspoll); +0 ,0 , uMACfragNum, byFBOption, pDevice->wCurrentRate, + is_pspoll); hdr->duration_id = uDuration;
Signature · 1 line
2.34.1
PATCH v5 6/6 staging: vt6655: refactor code to avoid a line ending in '('
In reply to Tanjuate Brunostarjoin unnecessary split lines to avoid them ending in '('
Signed-off-by Tanjuate Brunostar <[email protected]>
--- drivers/staging/vt6655/rxtx.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/staging/vt6655/rxtx.c +9 -11
@@ -1118,7 +1118,7 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_cts )); pvRTS =NULL ; - pvCTS = (void *) (pbyTxBufferAddr + wTxBufSize + + pvCTS = (void *)(pbyTxBufferAddr + wTxBufSize +sizeof (struct vnt_rrv_time_cts ) + cbMICHDR); pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_cts) + cbMICHDR +
@@ -1296,10 +1296,8 @@ static void vnt_fill_txkey(struct ieee80211_hdr *hdr, u8 *key_buffer,ether_addr_copy (mic_hdr->addr2, hdr->addr2);ether_addr_copy (mic_hdr->addr3, hdr->addr3); - mic_hdr->frame_control =cpu_to_le16 ( -le16_to_cpu (hdr->frame_control) &0xc78f ); - mic_hdr->seq_ctrl =cpu_to_le16 ( -le16_to_cpu (hdr->seq_ctrl) &0xf ); + mic_hdr->frame_control =cpu_to_le16 (le16_to_cpu (hdr->frame_control) &0xc78f ); + mic_hdr->seq_ctrl =cpu_to_le16 (le16_to_cpu (hdr->seq_ctrl) &0xf );if (ieee80211_has_a4 (hdr->frame_control))ether_addr_copy (mic_hdr->addr4, hdr->addr4);
@@ -1470,9 +1468,9 @@ static int vnt_beacon_xmit(struct vnt_private *priv,/* Get Duration and TimeStampOff */ short_head->duration = -cpu_to_le16 ((u16 )s_uGetDataDuration (priv,DATADUR_B , - frame_size,PK_TYPE_11A , current_rate, - false,0 ,0 ,1 ,AUTO_FB_NONE )); +cpu_to_le16 ((u16 )s_uGetDataDuration (priv,DATADUR_B , frame_size, +PK_TYPE_11A , current_rate, false, +0 ,0 ,1 ,AUTO_FB_NONE )); short_head->time_stamp_off =vnt_time_stamp_off (priv, current_rate);
@@ -1486,9 +1484,9 @@ static int vnt_beacon_xmit(struct vnt_private *priv,/* Get Duration and TimeStampOff */ short_head->duration = -cpu_to_le16 ((u16 )s_uGetDataDuration (priv,DATADUR_B , - frame_size,PK_TYPE_11B , current_rate, - false,0 ,0 ,1 ,AUTO_FB_NONE )); +cpu_to_le16 ((u16 )s_uGetDataDuration (priv,DATADUR_B , frame_size, +PK_TYPE_11B , current_rate, false, +0 ,0 ,1 ,AUTO_FB_NONE )); short_head->time_stamp_off =vnt_time_stamp_off (priv, current_rate);
Signature · 1 line
2.34.1