diff mbox series

[v3] staging: vt6655: change the function name s_vFillRTSHead

Message ID Y3KJBdUue5otWgOT@elroy-temp-vm.gaiao0uenmiufjlowqgp5yxwdh.gvxx.internal.cloudapp.net
State New
Headers
Series [v3] staging: vt6655: change the function name s_vFillRTSHead |

Commit Message

Tanjuate Brunostar Nov. 14, 2022, 6:29 p.m. UTC 
  Remove the use of Hungarian notation, which is not used in the Linux
kernel. Reported by checkpatch
Add indentation to the affected function to follow the Linux kernel
coding style. This improves visibility

Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
v2: corrected confusing changlog message on this patch
v3: removed unnecessary function prototype

 drivers/staging/vt6655/rxtx.c | 40 ++++++++++++-----------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

Comments

Philipp Hortmann Nov. 14, 2022, 8:19 p.m. UTC | #1 
On 11/14/22 19:29, Tanjuate Brunostar wrote:
> Remove the use of Hungarian notation, which is not used in the Linux
> kernel. Reported by checkpatch
> Add indentation to the affected function to follow the Linux kernel
> coding style. This improves visibility
> 
> Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
> ---
> v2: corrected confusing changlog message on this patch
> v3: removed unnecessary function prototype
> 
>   drivers/staging/vt6655/rxtx.c | 40 ++++++++++++-----------------------
>   1 file changed, 13 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> index 31ae99b3cb35..715b323cd2a8 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,16 +85,6 @@ 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 s_vGenerateTxParameter(struct vnt_private *pDevice,
>   				   unsigned char byPktType,
>   				   struct vnt_tx_fifo_head *,
> @@ -555,19 +545,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;
>   
> @@ -912,7 +898,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 +917,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 +931,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;
>   

Hi,

I cannot apply your patch.

Here my git infos:
git remote show origin
* remote origin
   Fetch URL: 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
...
git branch -a
my branch: staging-testing

Bye Philipp
Tanjuate Brunostar Nov. 14, 2022, 10:59 p.m. UTC | #2 
On Mon, Nov 14, 2022 at 9:19 PM Philipp Hortmann
<philipp.g.hortmann@gmail.com> wrote:
>
> On 11/14/22 19:29, Tanjuate Brunostar wrote:
> > Remove the use of Hungarian notation, which is not used in the Linux
> > kernel. Reported by checkpatch
> > Add indentation to the affected function to follow the Linux kernel
> > coding style. This improves visibility
> >
> > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
> > ---
> > v2: corrected confusing changlog message on this patch
> > v3: removed unnecessary function prototype
> >
> >   drivers/staging/vt6655/rxtx.c | 40 ++++++++++++-----------------------
> >   1 file changed, 13 insertions(+), 27 deletions(-)
> >
> > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> > index 31ae99b3cb35..715b323cd2a8 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,16 +85,6 @@ 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 s_vGenerateTxParameter(struct vnt_private *pDevice,
> >                                  unsigned char byPktType,
> >                                  struct vnt_tx_fifo_head *,
> > @@ -555,19 +545,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;
> >
> > @@ -912,7 +898,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 +917,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 +931,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;
> >
>
> Hi,
>
> I cannot apply your patch.
>
> Here my git infos:
> git remote show origin
> * remote origin
>    Fetch URL:
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> ...
> git branch -a
> my branch: staging-testing
>
> Bye Philipp

I was recently asked to rebase to the staging-next branch. I think
this is where there is conflict
Philipp Hortmann Nov. 15, 2022, 6:23 a.m. UTC | #3 
On 11/14/22 23:59, Tanju Brunostar wrote:
> On Mon, Nov 14, 2022 at 9:19 PM Philipp Hortmann
> <philipp.g.hortmann@gmail.com> wrote:
>>
>> On 11/14/22 19:29, Tanjuate Brunostar wrote:
>>> Remove the use of Hungarian notation, which is not used in the Linux
>>> kernel. Reported by checkpatch
>>> Add indentation to the affected function to follow the Linux kernel
>>> coding style. This improves visibility
>>>
>>> Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
>>> ---
>>> v2: corrected confusing changlog message on this patch
>>> v3: removed unnecessary function prototype
>>>
>>>    drivers/staging/vt6655/rxtx.c | 40 ++++++++++++-----------------------
>>>    1 file changed, 13 insertions(+), 27 deletions(-)
>>>
>>> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
>>> index 31ae99b3cb35..715b323cd2a8 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,16 +85,6 @@ 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 s_vGenerateTxParameter(struct vnt_private *pDevice,
>>>                                   unsigned char byPktType,
>>>                                   struct vnt_tx_fifo_head *,
>>> @@ -555,19 +545,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;
>>>
>>> @@ -912,7 +898,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 +917,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 +931,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;
>>>
>>
>> Hi,
>>
>> I cannot apply your patch.
>>
>> Here my git infos:
>> git remote show origin
>> * remote origin
>>     Fetch URL:
>> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
>> ...
>> git branch -a
>> my branch: staging-testing
>>
>> Bye Philipp
> 
> I was recently asked to rebase to the staging-next branch. I think
> this is where there is conflict

I do not think so.
between this commit:
commit 335140116703920ddcbd9a09ae9edfb02902f3d1 (HEAD -> 
staging-testing, origin/staging-testing)
and this one:
commit a614e753e8e7f3322b560dcf6eaf44468ec22b3a (origin/staging-next)

are only 4 commits and non of them is regarding the vt6655.

So this should work.

kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git status
On branch staging-testing
Your branch is up to date with 'origin/staging-testing'.

nothing to commit, working tree clean
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git pull
Already up to date.
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ cat 
~/Downloads/20221114-\[PATCH\ v3\]\ staging_\ vt6655_\ change\ the\ 
function\ name\ s_vFillRTSHead-5397.txt | git am
Applying: staging: vt6655: change the function name s_vFillRTSHead
error: patch failed: drivers/staging/vt6655/rxtx.c:85
error: drivers/staging/vt6655/rxtx.c: patch does not apply
Patch failed at 0001 staging: vt6655: change the function name 
s_vFillRTSHead
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$

Bye Philipp
Tanjuate Brunostar Nov. 15, 2022, 7:09 a.m. UTC | #4 
On Tue, Nov 15, 2022 at 7:23 AM Philipp Hortmann
<philipp.g.hortmann@gmail.com> wrote:
>
> On 11/14/22 23:59, Tanju Brunostar wrote:
> > On Mon, Nov 14, 2022 at 9:19 PM Philipp Hortmann
> > <philipp.g.hortmann@gmail.com> wrote:
> >>
> >> On 11/14/22 19:29, Tanjuate Brunostar wrote:
> >>> Remove the use of Hungarian notation, which is not used in the Linux
> >>> kernel. Reported by checkpatch
> >>> Add indentation to the affected function to follow the Linux kernel
> >>> coding style. This improves visibility
> >>>
> >>> Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
> >>> ---
> >>> v2: corrected confusing changlog message on this patch
> >>> v3: removed unnecessary function prototype
> >>>
> >>>    drivers/staging/vt6655/rxtx.c | 40 ++++++++++++-----------------------
> >>>    1 file changed, 13 insertions(+), 27 deletions(-)
> >>>
> >>> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> >>> index 31ae99b3cb35..715b323cd2a8 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,16 +85,6 @@ 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 s_vGenerateTxParameter(struct vnt_private *pDevice,
> >>>                                   unsigned char byPktType,
> >>>                                   struct vnt_tx_fifo_head *,
> >>> @@ -555,19 +545,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;
> >>>
> >>> @@ -912,7 +898,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 +917,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 +931,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;
> >>>
> >>
> >> Hi,
> >>
> >> I cannot apply your patch.
> >>
> >> Here my git infos:
> >> git remote show origin
> >> * remote origin
> >>     Fetch URL:
> >> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> >> ...
> >> git branch -a
> >> my branch: staging-testing
> >>
> >> Bye Philipp
> >
> > I was recently asked to rebase to the staging-next branch. I think
> > this is where there is conflict
>
> I do not think so.
> between this commit:
> commit 335140116703920ddcbd9a09ae9edfb02902f3d1 (HEAD ->
> staging-testing, origin/staging-testing)
> and this one:
> commit a614e753e8e7f3322b560dcf6eaf44468ec22b3a (origin/staging-next)
>
> are only 4 commits and non of them is regarding the vt6655.
>
> So this should work.
>
> kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git status
> On branch staging-testing
> Your branch is up to date with 'origin/staging-testing'.
>
> nothing to commit, working tree clean
> kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git pull
> Already up to date.
> kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ cat
> ~/Downloads/20221114-\[PATCH\ v3\]\ staging_\ vt6655_\ change\ the\
> function\ name\ s_vFillRTSHead-5397.txt | git am
> Applying: staging: vt6655: change the function name s_vFillRTSHead
> error: patch failed: drivers/staging/vt6655/rxtx.c:85
> error: drivers/staging/vt6655/rxtx.c: patch does not apply
> Patch failed at 0001 staging: vt6655: change the function name
> s_vFillRTSHead
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$
>
> Bye Philipp
>

I remember you said about my previous patches that you could not apply
them. But another mentor did. So the only reason I could think of is
that my branch is based off of staging-next why yours is based on
staging-testing
Philipp Hortmann Nov. 16, 2022, 6:53 p.m. UTC | #5 
On 11/14/22 23:59, Tanju Brunostar wrote:
> On Mon, Nov 14, 2022 at 9:19 PM Philipp Hortmann
> <philipp.g.hortmann@gmail.com> wrote:
>>
>> On 11/14/22 19:29, Tanjuate Brunostar wrote:
>>> Remove the use of Hungarian notation, which is not used in the Linux
>>> kernel. Reported by checkpatch
>>> Add indentation to the affected function to follow the Linux kernel
>>> coding style. This improves visibility
>>>
>>> Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
>>> ---
>>> v2: corrected confusing changlog message on this patch
>>> v3: removed unnecessary function prototype
>>>
>>>    drivers/staging/vt6655/rxtx.c | 40 ++++++++++++-----------------------
>>>    1 file changed, 13 insertions(+), 27 deletions(-)
>>>
>>> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
>>> index 31ae99b3cb35..715b323cd2a8 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,16 +85,6 @@ 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 s_vGenerateTxParameter(struct vnt_private *pDevice,
>>>                                   unsigned char byPktType,
>>>                                   struct vnt_tx_fifo_head *,
>>> @@ -555,19 +545,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;
>>>
>>> @@ -912,7 +898,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 +917,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 +931,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;
>>>
>>
>> Hi,
>>
>> I cannot apply your patch.
>>
>> Here my git infos:
>> git remote show origin
>> * remote origin
>>     Fetch URL:
>> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
>> ...
>> git branch -a
>> my branch: staging-testing
>>
>> Bye Philipp
> 
> I was recently asked to rebase to the staging-next branch. I think
> this is where there is conflict


Hi,

now I can tell you where the issue is:

kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply 
--reject --ignore-space-change --ignore-whitespace 
~/Downloads/20221114-\[PATCH\ v3\]\ staging_\ vt6655_\ change\ the\ 
function\ name\ s_vFillRTSHead-5397.txt
Checking patch drivers/staging/vt6655/rxtx.c...
error: while searching for:
#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 s_vGenerateTxParameter(struct vnt_private *pDevice,
				   unsigned char byPktType,
				   struct vnt_tx_fifo_head *,

error: patch failed: drivers/staging/vt6655/rxtx.c:85
Hunk #3 succeeded at 567 (offset 22 lines).
Hunk #4 succeeded at 920 (offset 22 lines).
Hunk #5 succeeded at 939 (offset 22 lines).
Hunk #6 succeeded at 953 (offset 22 lines).
Applying patch drivers/staging/vt6655/rxtx.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.

Here how this place looks like in my repo:
#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
);

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

switching branch

kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git branch -a
* staging-next

kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply 
--reject --ignore-space-change --ignore-whitespace 
~/Downloads/20221114-\[PATCH\ v3\]\ staging_\ vt6655_\ change\ the\ 
function\ name\ s_vFillRTSHead-5397.txt
Checking patch drivers/staging/vt6655/rxtx.c...
error: while searching for:
#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 s_vGenerateTxParameter(struct vnt_private *pDevice,
				   unsigned char byPktType,
				   struct vnt_tx_fifo_head *,

error: patch failed: drivers/staging/vt6655/rxtx.c:85
Hunk #3 succeeded at 567 (offset 22 lines).
Hunk #4 succeeded at 920 (offset 22 lines).
Hunk #5 succeeded at 939 (offset 22 lines).
Hunk #6 succeeded at 953 (offset 22 lines).
Applying patch drivers/staging/vt6655/rxtx.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.

Same issue.

Bye Philipp
Greg KH Nov. 17, 2022, 6:45 p.m. UTC | #6 
On Mon, Nov 14, 2022 at 06:29:25PM +0000, Tanjuate Brunostar wrote:
> Remove the use of Hungarian notation, which is not used in the Linux
> kernel. Reported by checkpatch
> Add indentation to the affected function to follow the Linux kernel
> coding style. This improves visibility
> 
> Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
> ---
> v2: corrected confusing changlog message on this patch
> v3: removed unnecessary function prototype

Does not apply to my tree:

checking file drivers/staging/vt6655/rxtx.c
Hunk #2 FAILED at 85.
Hunk #3 succeeded at 567 (offset 12 lines).
Hunk #4 succeeded at 920 (offset 12 lines).
Hunk #5 succeeded at 939 (offset 12 lines).
Hunk #6 succeeded at 953 (offset 12 lines).
1 out of 6 hunks FAILED
diff mbox series

Patch

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 31ae99b3cb35..715b323cd2a8 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,16 +85,6 @@  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 s_vGenerateTxParameter(struct vnt_private *pDevice,
 				   unsigned char byPktType,
 				   struct vnt_tx_fifo_head *,
@@ -555,19 +545,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;
 
@@ -912,7 +898,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 +917,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 +931,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;