Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1612239 > unrolled thread

[PATCH] staging: rtl8712: fixed multiple line derefence issue

Started byPrasant Jalan <prasant.jalan@gmail.com>
First post2017-03-29 20:40 +0200
Last post2017-04-03 08:10 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] staging: rtl8712: fixed multiple line derefence issue Prasant Jalan <prasant.jalan@gmail.com> - 2017-03-29 20:40 +0200
    Re: [PATCH] staging: rtl8712: fixed multiple line derefence issue Prasant Jalan <prasant.jalan@gmail.com> - 2017-04-03 06:20 +0200
      Re: [PATCH] staging: rtl8712: fixed multiple line derefence issue Joe Perches <joe@perches.com> - 2017-04-03 07:00 +0200
        Re: [PATCH] staging: rtl8712: fixed multiple line derefence issue Prasant Jalan <prasant.jalan@gmail.com> - 2017-04-03 08:10 +0200

#1612239 — [PATCH] staging: rtl8712: fixed multiple line derefence issue

FromPrasant Jalan <prasant.jalan@gmail.com>
Date2017-03-29 20:40 +0200
Subject[PATCH] staging: rtl8712: fixed multiple line derefence issue
Message-ID<tqqFH-2pt-1@gated-at.bofh.it>
Checkpatch emits WARNING: Avoid multiple line dereference.

Trivial indentation improvement helps fix the checkpatch warning.

Signed-off-by: Prasant Jalan <prasant.jalan@gmail.com>
---
 drivers/staging/rtl8712/rtl871x_xmit.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
index de88819..10edf00 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -213,8 +213,9 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt,
 		if (padapter->pwrctrlpriv.pwr_mode !=
 		    padapter->registrypriv.power_mgnt) {
 			del_timer_sync(&pmlmepriv->dhcp_timer);
-			r8712_set_ps_mode(padapter, padapter->registrypriv.
-				power_mgnt, padapter->registrypriv.smart_ps);
+			r8712_set_ps_mode(padapter,
+					  padapter->registrypriv.power_mgnt,
+					  padapter->registrypriv.smart_ps);
 		}
 	}
 }
@@ -416,15 +417,14 @@ static sint xmitframe_addmic(struct _adapter *padapter,
 							   &pframe[10], 6);
 			}
 			if (pqospriv->qos_option == 1)
-					priority[0] = (u8)pxmitframe->
-						      attrib.priority;
+				priority[0] = (u8)pxmitframe->attrib.priority;
 			r8712_secmicappend(&micdata, &priority[0], 4);
 			payload = pframe;
 			for (curfragnum = 0; curfragnum < pattrib->nr_frags;
 			     curfragnum++) {
 				payload = (u8 *)RND4((addr_t)(payload));
-				payload = payload + pattrib->
-					  hdrlen + pattrib->iv_len;
+				payload = payload + pattrib->hdrlen +
+					  pattrib->iv_len;
 				if ((curfragnum + 1) == pattrib->nr_frags) {
 					length = pattrib->last_txcmdsz -
 						  pattrib->hdrlen -
-- 
2.7.4

[toc] | [next] | [standalone]


#1614876

FromPrasant Jalan <prasant.jalan@gmail.com>
Date2017-04-03 06:20 +0200
Message-ID<ts1Dc-1UL-5@gated-at.bofh.it>
In reply to#1612239
On Thu, Mar 30, 2017 at 12:03 AM, Prasant Jalan <prasant.jalan@gmail.com> wrote:
> Checkpatch emits WARNING: Avoid multiple line dereference.
>
> Trivial indentation improvement helps fix the checkpatch warning.
>
> Signed-off-by: Prasant Jalan <prasant.jalan@gmail.com>
> ---
>  drivers/staging/rtl8712/rtl871x_xmit.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
> index de88819..10edf00 100644
> --- a/drivers/staging/rtl8712/rtl871x_xmit.c
> +++ b/drivers/staging/rtl8712/rtl871x_xmit.c
> @@ -213,8 +213,9 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt,
>                 if (padapter->pwrctrlpriv.pwr_mode !=
>                     padapter->registrypriv.power_mgnt) {
>                         del_timer_sync(&pmlmepriv->dhcp_timer);
> -                       r8712_set_ps_mode(padapter, padapter->registrypriv.
> -                               power_mgnt, padapter->registrypriv.smart_ps);
> +                       r8712_set_ps_mode(padapter,
> +                                         padapter->registrypriv.power_mgnt,
> +                                         padapter->registrypriv.smart_ps);
>                 }
>         }
>  }
> @@ -416,15 +417,14 @@ static sint xmitframe_addmic(struct _adapter *padapter,
>                                                            &pframe[10], 6);
>                         }
>                         if (pqospriv->qos_option == 1)
> -                                       priority[0] = (u8)pxmitframe->
> -                                                     attrib.priority;
> +                               priority[0] = (u8)pxmitframe->attrib.priority;
>                         r8712_secmicappend(&micdata, &priority[0], 4);
>                         payload = pframe;
>                         for (curfragnum = 0; curfragnum < pattrib->nr_frags;
>                              curfragnum++) {
>                                 payload = (u8 *)RND4((addr_t)(payload));
> -                               payload = payload + pattrib->
> -                                         hdrlen + pattrib->iv_len;
> +                               payload = payload + pattrib->hdrlen +
> +                                         pattrib->iv_len;
>                                 if ((curfragnum + 1) == pattrib->nr_frags) {
>                                         length = pattrib->last_txcmdsz -
>                                                   pattrib->hdrlen -
> --
> 2.7.4
>


Hi all,


A gentle reminder for my small patch. Some comments will be most helpful.


Regards, Prasant Jalan

[toc] | [prev] | [next] | [standalone]


#1614880

FromJoe Perches <joe@perches.com>
Date2017-04-03 07:00 +0200
Message-ID<ts2fT-2bK-1@gated-at.bofh.it>
In reply to#1614876
On Mon, 2017-04-03 at 09:43 +0530, Prasant Jalan wrote:
> On Thu, Mar 30, 2017 at 12:03 AM, Prasant Jalan <prasant.jalan@gmail.com> wrote:
> > Checkpatch emits WARNING: Avoid multiple line dereference.
> > 
> > Trivial indentation improvement helps fix the checkpatch warning.
[]
> > diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
[]
> > @@ -416,15 +417,14 @@ static sint xmitframe_addmic(struct _adapter *padapter,
> >                                                            &pframe[10], 6);
> >                         }
> >                         if (pqospriv->qos_option == 1)
> > -                                       priority[0] = (u8)pxmitframe->
> > -                                                     attrib.priority;
> > +                               priority[0] = (u8)pxmitframe->attrib.priority;
> >                         r8712_secmicappend(&micdata, &priority[0], 4);
> >                         payload = pframe;
> >                         for (curfragnum = 0; curfragnum < pattrib->nr_frags;
> >                              curfragnum++) {
> >                                 payload = (u8 *)RND4((addr_t)(payload));
> > -                               payload = payload + pattrib->
> > -                                         hdrlen + pattrib->iv_len;
> > +                               payload = payload + pattrib->hdrlen +
> > +                                         pattrib->iv_len;

+= would be shorter

[toc] | [prev] | [next] | [standalone]


#1614900

FromPrasant Jalan <prasant.jalan@gmail.com>
Date2017-04-03 08:10 +0200
Message-ID<ts3lD-35U-13@gated-at.bofh.it>
In reply to#1614880
On Mon, Apr 3, 2017 at 10:27 AM, Joe Perches <joe@perches.com> wrote:
> On Mon, 2017-04-03 at 09:43 +0530, Prasant Jalan wrote:
>> On Thu, Mar 30, 2017 at 12:03 AM, Prasant Jalan <prasant.jalan@gmail.com> wrote:
>> > Checkpatch emits WARNING: Avoid multiple line dereference.
>> >
>> > Trivial indentation improvement helps fix the checkpatch warning.
> []
>> > diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
> []
>> > @@ -416,15 +417,14 @@ static sint xmitframe_addmic(struct _adapter *padapter,
>> >                                                            &pframe[10], 6);
>> >                         }
>> >                         if (pqospriv->qos_option == 1)
>> > -                                       priority[0] = (u8)pxmitframe->
>> > -                                                     attrib.priority;
>> > +                               priority[0] = (u8)pxmitframe->attrib.priority;
>> >                         r8712_secmicappend(&micdata, &priority[0], 4);
>> >                         payload = pframe;
>> >                         for (curfragnum = 0; curfragnum < pattrib->nr_frags;
>> >                              curfragnum++) {
>> >                                 payload = (u8 *)RND4((addr_t)(payload));
>> > -                               payload = payload + pattrib->
>> > -                                         hdrlen + pattrib->iv_len;
>> > +                               payload = payload + pattrib->hdrlen +
>> > +                                         pattrib->iv_len;
>
> += would be shorter

Hi Joe,

Looks like back to school for me for overlooking such a trivial thing.

Thanks for the pointer, I will update the patch and resend.


Regards, Prasant

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web