some checkpatch fixes in the file rxtx.c
cover some checkpatch fixes in the file rxtx.c
These fixes are focused on the function s_vFillRTSHead
Tanjuate Brunostar (2):
change the function name s_vFillRTSHead
Join some lines of code to avoid code lines ending in (
drivers/staging/vt6655/rxtx.c | 48 ++++++++++++++++------------------- 1 file changed, 22 insertions(+), 26 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 change the function name s_vFillRTSHead
Remove the use of Hungarian notation, which is not used in the Linux kernel
--- drivers/staging/vt6655/rxtx.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/vt6655/rxtx.c +13 -13
@@ -23,7 +23,7 @@* s_uGetTxRsvTime- get frame reserved time * s_vFillCTSHead- fulfill CTS ctl header * s_vFillFragParameter- Set fragment ctl parameter. -* s_vFillRTSHead- fulfill RTS ctl header +* fill_rts_head- fulfill RTS ctl header * s_vFillTxKey- fulfill tx encrypt key * s_vSWencryption- Software encrypt header * vDMA0_tx_80211- tx 802.11 frame via dma0
@@ -85,15 +85,15 @@ static const unsigned short fb_opt1[2][5] = {#define DATADUR_A_F1 13/*--------------------- Static Functions --------------------------*/ -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 fill_rts_head (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_vGenerateTxParameter(struct vnt_private *pDevice, unsigned char byPktType,
@@ -912,7 +912,7 @@ s_vGenerateTxParameter( 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); +fill_rts_head (pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); }else {/* RTS_needless, PCF mode */ struct vnt_rrv_time_cts *buf = pvRrvTime;
@@ -931,7 +931,7 @@ s_vGenerateTxParameter( 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); +fill_rts_head (pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); }else if (!pvRTS) {/* RTS_needless, non PCF mode */ struct vnt_rrv_time_ab *buf = pvRrvTime;
@@ -945,7 +945,7 @@ s_vGenerateTxParameter( 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); +fill_rts_head (pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); }else {/* RTS_needless, non PCF mode */ struct vnt_rrv_time_ab *buf = pvRrvTime;
Signature · 1 line
2.34.1
PATCH 2/2 Join some lines of code to avoid a line ending in a (
In reply to Tanjuate BrunostarThe code line ends with a '(' which is not allowed in Linux kernel coding. Joining the lines and indenting correctly improves visibility
--- drivers/staging/vt6655/rxtx.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/staging/vt6655/rxtx.c +9 -13
@@ -555,19 +555,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 fill_rts_head (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 ;
Signature · 1 line
2.34.1
Re: [PATCH 1/2] change the function name s_vFillRTSHead
In reply to Tanjuate BrunostarQuoted 2 lines · Tanjuate Brunostar
Remove the use of Hungarian notation, which is not used in the Linux kernel
Period at the end of the sentence. It woudl still be good to acknowledge checkpatch.
julia
Quoted 76 lines
Signed-off-by Tanjuate Brunostar <[email protected]>--- drivers/staging/vt6655/rxtx.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)drivers/staging/vt6655/rxtx.c +13
-14@@ -23,7 +23,7 @@* s_uGetTxRsvTime- get frame reserved time * s_vFillCTSHead- fulfill CTS ctl header * s_vFillFragParameter- Set fragment ctl parameter. -* s_vFillRTSHead- fulfill RTS ctl header +* fill_rts_head- fulfill RTS ctl header * s_vFillTxKey- fulfill tx encrypt key * s_vSWencryption- Software encrypt header * vDMA0_tx_80211- tx 802.11 frame via dma0 @@ -85,15 +85,15 @@ static const unsigned short fb_opt1[2][5] = {#define DATADUR_A_F1 13/*--------------------- Static Functions --------------------------*/ -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 fill_rts_head (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_vGenerateTxParameter(struct vnt_private *pDevice, unsigned char byPktType,@@ -912,7 +912,7 @@ s_vGenerateTxParameter( 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); +fill_rts_head (pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); }else {/* RTS_needless, PCF mode */ struct vnt_rrv_time_cts *buf = pvRrvTime;@@ -931,7 +931,7 @@ s_vGenerateTxParameter( 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); +fill_rts_head (pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); }else if (!pvRTS) {/* RTS_needless, non PCF mode */ struct vnt_rrv_time_ab *buf = pvRrvTime;@@ -945,7 +945,7 @@ s_vGenerateTxParameter( 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); +fill_rts_head (pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); }else {/* RTS_needless, non PCF mode */ struct vnt_rrv_time_ab *buf = pvRrvTime; --2.34.1
Re: [PATCH 2/2] Join some lines of code to avoid a line ending in a (
In reply to Tanjuate BrunostarQuoted 3 lines · Tanjuate Brunostar
The code line ends with a '(' which is not allowed in Linux kernel coding. Joining the lines and indenting correctly improves visibility
I think Greg discouraged saying "not allowed by the coding style" and instead encouraged thinking about the reason why the thing is not a good idea and the change is helpful.
julia
Quoted 44 lines
Signed-off-by Tanjuate Brunostar <[email protected]>--- drivers/staging/vt6655/rxtx.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)drivers/staging/vt6655/rxtx.c +9
-14@@ -555,19 +555,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 fill_rts_head (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 ; --2.34.1