Checkpatch cleanup in rxtx.c
v9 cover Checkpatch cleanup in rxtx.c
v9: reorganized the changelog messages on this patch
v8: made commit messages clearer, unsuccessfuly
v7: made log messages less confusing
v6: fixed some errors on commit messages
v5: shortend changelog comments
v4: made some changes on the code
v3: fixed compilation errors
v2: tried fixing compilation erros unsuccessfuly
Tanjuate Brunostar (6):
staging: vt6655: fix lines of code ending in a '('
staging: vt6655: split long lines of code in s_uGetRTSCTSDuration
staging: vt6655: split long lines of code in s_uFillDataHead
staging: vt6655: split long lines of code in s_vGenerateTxParamete
staging: vt6655: split long lines of code in some functions
staging: vt6655: fix lines of code ending in a '('
drivers/staging/vt6655/rxtx.c | 542 ++++++++++++++++++++-------------- 1 file changed, 324 insertions(+), 218 deletions(-)
Signature · 1 line
2.34.1
PATCH v9 1/6 staging: vt6655: fix lines ending in a '('
fix several checkpatch errors related to lines ending with a '(' by joining some lines of code and indenting properly to improve 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 +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
PATCH v9 2/6 staging: vt6655: split long code lines in s_uGetRTSCTSDuration
In reply to Tanjuate BrunostarIncrease code visibility by splitting 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
PATCH v9 3/6 staging: vt6655: split long lines of code in s_uFillDataHead
In reply to Tanjuate BrunostarIncrease code visibility by splitting 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 v9 4/6 staging: vt6655: split long lines of code in s_vGenerateTxParamete
In reply to Tanjuate BrunostarIncrease code visibility by splitting 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 v9 5/6 staging: vt6655: split long lines of code in file
In reply to Tanjuate Brunostarincrease code visibility by splitting long lines of code in 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 v9 6/6 staging: vt6655: fix lines of code ending in a '('
In reply to Tanjuate Brunostarfix checkpatch errors related to lines ending with a '(' by joining some lines of code and indenting properly to improve visibility
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
Tanjuate,
Wow - I've seen 4 revs of this in 12 hours?!
I reviewed each Patch against the feedback previously offered, and it was not addressed, so I'm going to NAK this set and ask you to rework carefully before resending. I expect to see each specific piece of reviewer feedback, called out as addressed in the changelog.
BTW - I still prefer a single patch at a time while you are learning these mechanics, and to make sure that this type of patch is going to be accepted.
If you are still amenable to doing that, keep the version, but only send one patch at a time. When one gets accepted, apply those learnings to the second patch, and so on.
That should go more smoothly for you and your reviewers.
Alison
Quoted 31 lines · Tanjuate Brunostar
v9: reorganized the changelog messages on this patch
v8: made commit messages clearer, unsuccessfuly
v7: made log messages less confusing
v6: fixed some errors on commit messages
v5: shortend changelog comments
v4: made some changes on the code
v3: fixed compilation errors
v2: tried fixing compilation erros unsuccessfuly
Tanjuate Brunostar (6):
staging: vt6655: fix lines of code ending in a '('
staging: vt6655: split long lines of code ins_uGetRTSCTSDuration
staging: vt6655: split long lines of code ins_uFillDataHead
staging: vt6655: split long lines of code ins_vGenerateTxParamete
staging: vt6655: split long lines of code in some functions
staging: vt6655: fix lines of code ending in a '('drivers/staging/vt6655/rxtx.c | 542 ++++++++++++++++++++-------------- 1 file changed, 324 insertions(+), 218 deletions(-)Signature · 1 line
2.34.1
Greg KH
maintainerQuoted 1 line · Tanjuate Brunostar
v9: reorganized the changelog messages on this patch
You dropped the "staging: vt6655: " from this 0/X email, why?
Please take a day or two off, relax, and resubmit the series with _ALL_ review comments addressed.
thanks,
greg k-h
Greg KH
maintainerRe: [PATCH v9 2/6] staging: vt6655: split long code lines in s_uGetRTSCTSDuration
In reply to Tanjuate BrunostarQuoted 13 lines · Tanjuate Brunostar
Increase code visibility by splitting long lines of code in the
function:s_uGetRTSCTSDurationSigned-off-by Tanjuate Brunostar <[email protected]>--- drivers/staging/vt6655/rxtx.c | 108 ++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 32 deletions(-)drivers/staging/vt6655/rxtx.c +0
-0
drivers/staging/vt6655/rxtx.c static __le16 get_rtscts_time(struct vnt_private *priv, · line 192
Quoted 9 lines
drivers/staging/vt6655/rxtx.c +4
-2@@ -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);
While I understand the feeling of "let's fix this warning by wrapping the line!" type of solution, overall, it's NOT the correct thing to do.
Remember, coding style changes are to be done to make code easier to read and understand, not harder. The original code here is easier to read, and you made it harder to understand.
The "best" solution for this will be to fix up the line length by virtue of fixing up the incorrect variable names. Here is the original lines:
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);
but if you were to fix up just 1 function and one variable name, look at what happens and checkpatch is happy with it:
rts_time = get_frame_time(priv->preamble_type, pkt_type, 20, priv->top_basic_rate); ack_time = get_frame_time(priv->preamble_type, pkt_type, 14, priv->top_basic_rate);
Or even better:
type = priv->preamble_type; rate = priv->top_basic_rate; rts_time = get_frame_time(type, pkt_type, 20, rate); ack_time = get_frame_time(type, pkt_type, 14, rate);
Look, no line-wrapping and isn't that easier to understand? The second version here might even produce smaller compiled code overall, making it a even better solution.
So step back, revisit this whole series with the goal of overall making the code better and easier to review. Don't create a series just with the short-term goal of making checkpatch quiet.
Hope this helps,
greg k-h
Re: [PATCH v9 2/6] staging: vt6655: split long code lines in s_uGetRTSCTSDuration
Quoted 54 lines · Greg KH
Quoted 13 lines · Tanjuate Brunostar
Increase code visibility by splitting long lines of code in the
function:s_uGetRTSCTSDurationSigned-off-by Tanjuate Brunostar <[email protected]>--- drivers/staging/vt6655/rxtx.c | 108 ++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 32 deletions(-)drivers/staging/vt6655/rxtx.c +0
-0drivers/staging/vt6655/rxtx.c static __le16 get_rtscts_time(struct vnt_private *priv, · line 192
Quoted 9 lines
drivers/staging/vt6655/rxtx.c +4
-2@@ -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);While I understand the feeling of "let's fix this warning by wrapping the line!" type of solution, overall, it's NOT the correct thing to do.
Remember, coding style changes are to be done to make code easier to read and understand, not harder. The original code here is easier to read, and you made it harder to understand.
The "best" solution for this will be to fix up the line length by virtue of fixing up the incorrect variable names. Here is the original lines:
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);but if you were to fix up just 1 function and one variable name, look at what happens and checkpatch is happy with it:
rts_time = get_frame_time(priv->preamble_type, pkt_type, 20, priv->top_basic_rate); ack_time = get_frame_time(priv->preamble_type, pkt_type, 14, priv->top_basic_rate);Or even better:
type = priv->preamble_type; rate = priv->top_basic_rate; rts_time = get_frame_time(type, pkt_type, 20, rate); ack_time = get_frame_time(type, pkt_type, 14, rate);Look, no line-wrapping and isn't that easier to understand? The second version here might even produce smaller compiled code overall, making it a even better solution.
Quoted 7 lines
So step back, revisit this whole series with the goal of overall making the code better and easier to review. Don't create a series just with the short-term goal of making checkpatch quiet.
Hope this helps,
greg k-h
It does help. Thank you.