These fixes are focused on the function s_vFillRTSHead
v4: rebased by codebase against the staging-next branch of the
staging.git tree
v3: changed the function name from fill_rts_head to fill_rts_header as
head is conventionally used in lists
v2: changed confusing changelog messages
Tanjuate Brunostar (2):
staging: vt6655: change the function name s_vFillRTSHead
staging: vt6655: Join some lines of code to avoid code lines ending in
(
drivers/staging/vt6655/rxtx.c | 48 ++++++++++++++++-------------------
1 file changed, 22 insertions(+), 26 deletions(-)
--
2.34.1
Remove the use of Hungarian notation, which is not used in the Linux
kernel. Reported by checkpatch
Signed-off-by: Tanjuate Brunostar <[email protected]>
---
drivers/staging/vt6655/rxtx.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 31ae99b3cb35..c01fc1a593f3 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -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_header- 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_header(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_header(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_header(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
Fix checkpatch error related to code line ends with a '(', by joining
some lines and indenting correctly. This improves visibility
Signed-off-by: Tanjuate Brunostar <[email protected]>
---
drivers/staging/vt6655/rxtx.c | 40 ++++++++++++++++-------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index c01fc1a593f3..debc5d5daede 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -85,15 +85,15 @@ static const unsigned short fb_opt1[2][5] = {
#define DATADUR_A_F1 13
/*--------------------- Static Functions --------------------------*/
-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 fill_rts_header(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,
@@ -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_header(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
On Wed, 2022-11-02 at 14:08 +0000, Tanjuate Brunostar wrote:
> Remove the use of Hungarian notation, which is not used in the Linux
> kernel. Reported by checkpatch
[]
> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
[]
> @@ -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_header- 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);
Please compile the files modified by your patches _before_ submitting them.
Note the mismatch in your naming for this function prototype and the
actual function.
fill_rts_head vs fill_rts_header.
I believe this was already pointed out to you by the kernel robot.
The second commit under this patchset resolves this. please take a
look at it and let me know if I should change anything
On Wed, Nov 2, 2022 at 5:42 PM Joe Perches <[email protected]> wrote:
>
> On Wed, 2022-11-02 at 14:08 +0000, Tanjuate Brunostar wrote:
> > Remove the use of Hungarian notation, which is not used in the Linux
> > kernel. Reported by checkpatch
> []
> > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> []
> > @@ -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_header- 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);
>
> Please compile the files modified by your patches _before_ submitting them.
>
> Note the mismatch in your naming for this function prototype and the
> actual function.
>
> fill_rts_head vs fill_rts_header.
>
> I believe this was already pointed out to you by the kernel robot.
On Thu, Nov 03, 2022 at 09:48:59AM +0100, Tanju Brunostar wrote:
> The second commit under this patchset resolves this. please take a
> look at it and let me know if I should change anything
>
Please don't top post on email.
http://www.catb.org/jargon/html/T/top-post.html
Don't break the kernel and then fix it in a later patch. Just fix it
without first breaking it.
regards,
dan carpenter
On Thu, Nov 3, 2022 at 10:07 AM Dan Carpenter <[email protected]> wrote:
>
> On Thu, Nov 03, 2022 at 09:48:59AM +0100, Tanju Brunostar wrote:
> > The second commit under this patchset resolves this. please take a
> > look at it and let me know if I should change anything
> >
>
> Please don't top post on email.
> http://www.catb.org/jargon/html/T/top-post.html
>
Oh my mistake. sorry
> Don't break the kernel and then fix it in a later patch. Just fix it
> without first breaking it.
>
> regards,
> dan carpenter
>
I see. So I should send the changes in one patch right?