staging: rtl8712: fixed multiple line derefence issue
PATCH 1/1 staging: rtl8712: fixed multiple line derefence issue
Checkpatch emits WARNING: Avoid multiple line dereference.
Trivial indentation improvement helps fix the checkpatch warning.
--- drivers/staging/rtl8712/rtl871x_xmit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8712/rtl871x_xmit.c +6 -6
@@ -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 -
Signature · 1 line
2.7.4
Quoted 45 lines · Prasant Jalan
Checkpatch emits WARNING: Avoid multiple line dereference.
Trivial indentation improvement helps fix the checkpatch warning.
Signed-off-by Prasant Jalan <[email protected]>--- drivers/staging/rtl8712/rtl871x_xmit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/staging/rtl8712/rtl871x_xmit.c +6
-7@@ -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 - --
Quoted 2 lines
2.7.4
Hi all,
A gentle reminder for my small patch. Some comments will be most helpful.
Regards, Prasant Jalan
Quoted 4 lines · Prasant Jalan
Quoted 3 lines · Prasant Jalan
Checkpatch emits WARNING: Avoid multiple line dereference.
Trivial indentation improvement helps fix the checkpatch warning.
[]
Quoted 1 line
drivers/staging/rtl8712/rtl871x_xmit.c
Quoted 1 line
drivers/staging/rtl8712/rtl871x_xmit.c +0
-0
[]
Quoted 8 lines
Quoted 8 lines
drivers/staging/rtl8712/rtl871x_xmit.c +1
-2@@ -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 );
Quoted 8 lines
drivers/staging/rtl8712/rtl871x_xmit.c static sint xmitframe_addmic(struct _adapter *padapter, · line 427
Quoted 8 lines
drivers/staging/rtl8712/rtl871x_xmit.c +2
-2payload = 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
Quoted 18 lines · Joe Perches
Quoted 4 lines · Prasant Jalan
Quoted 3 lines · Prasant Jalan
Checkpatch emits WARNING: Avoid multiple line dereference.
Trivial indentation improvement helps fix the checkpatch warning.
[]
Quoted 1 line
drivers/staging/rtl8712/rtl871x_xmit.c
Quoted 1 line
drivers/staging/rtl8712/rtl871x_xmit.c +0
-0[]
Quoted 10 lines
Quoted 10 lines
drivers/staging/rtl8712/rtl871x_xmit.c +1
-2@@ -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;
Quoted 8 lines
Quoted 6 lines
drivers/staging/rtl8712/rtl871x_xmit.c static sint xmitframe_addmic(struct _adapter *padapter, · line 427
Quoted 6 lines
drivers/staging/rtl8712/rtl871x_xmit.c +2
-2curfragnum++) { 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