staging: rtl8723bs: Fix multiple assignment warning
PATCH RESEND 1/3 staging: rtl8723bs: Fix multiple assignment warning
This patch splits assignments into multiple lines to solve the multiple assignment warning.
Issue found by checkpatch.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 24 +++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +16 -8
@@ -146,7 +146,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_XMITBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead; pxmitbuf->flags =XMIT_VO_QUEUE ;
@@ -225,7 +226,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_XMIT_EXTBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead;list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue));#ifdef DBG_XMIT_BUF_EXT
@@ -255,7 +257,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_CMDBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead; pxmitbuf->alloc_sz =MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ ; } }
@@ -1366,11 +1369,13 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmitstruct ieee80211_hdr *pwlanhdr;u8 MME [_MME_IE_LENGTH_];u32 ori_len; - mem_start = pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; + pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; + mem_start = pframe; pwlanhdr = (struct ieee80211_hdr *)pframe; ori_len =BIP_AAD_SIZE +pattrib->pktlen; - tmp_buf =BIP_AAD =rtw_zmalloc (ori_len); +BIP_AAD =rtw_zmalloc (ori_len); + tmp_buf =BIP_AAD ; subtype =GetFrameSubType (pframe);/* bit(7)~bit(2) */ if (!BIP_AAD )
@@ -1623,7 +1628,8 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpriv, pxmitbuf->priv_data =NULL ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->ptail; pxmitbuf->agg_num =0 ; pxmitbuf->pg_num =0 ;
@@ -1700,7 +1706,8 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) pxmitbuf->priv_data =NULL ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->ptail; pxmitbuf->agg_num =1 ;if (pxmitbuf->sctx) {
@@ -1772,7 +1779,8 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) pxmitbuf->priv_data =NULL ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->ptail; pxmitbuf->agg_num =0 ; pxmitbuf->pg_num =0 ;
Signature · 1 line
2.20.1
PATCH RESEND 2/3 staging: rtl8723bs: Remove unnecessary parentheses
This patch removes unnecessary parentheses.
Issue found by checkpatch
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 62 +++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +31 -31
@@ -89,7 +89,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf;for (i =0 ; i <NR_XMITFRAME ; i++) { -INIT_LIST_HEAD (&(pxframe->list)); +INIT_LIST_HEAD (&pxframe->list); pxframe->padapter = padapter; pxframe->frame_tag =NULL_FRAMETAG ;
@@ -99,7 +99,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe->buf_addr =NULL ; pxframe->pxmitbuf =NULL ; -list_add_tail (&(pxframe->list), &(pxmitpriv->free_xmit_queue.queue)); +list_add_tail (&pxframe->list, &pxmitpriv->free_xmit_queue.queue); pxframe++; }
@@ -151,7 +151,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->flags =XMIT_VO_QUEUE ; -list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmitbuf_queue.queue)); +list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmitbuf_queue.queue);#ifdef DBG_XMIT_BUF pxmitbuf->no = i;#endif
@@ -177,7 +177,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe = (struct xmit_frame *)pxmitpriv->xframe_ext;for (i =0 ; i <NR_XMIT_EXTBUFF ; i++) { -INIT_LIST_HEAD (&(pxframe->list)); +INIT_LIST_HEAD (&pxframe->list); pxframe->padapter = padapter; pxframe->frame_tag =NULL_FRAMETAG ;
@@ -189,7 +189,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe->ext_tag =1 ; -list_add_tail (&(pxframe->list), &(pxmitpriv->free_xframe_ext_queue.queue)); +list_add_tail (&pxframe->list, &pxmitpriv->free_xframe_ext_queue.queue); pxframe++; }
@@ -229,7 +229,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->ptail = pxmitbuf->phead; pxmitbuf->pdata = pxmitbuf->phead; -list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue)); +list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmit_extbuf_queue.queue);#ifdef DBG_XMIT_BUF_EXT pxmitbuf->no = i;#endif
@@ -375,8 +375,8 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *u32 sz;struct pkt_attrib *pattrib = &pxmitframe->attrib;/* struct sta_info *psta = pattrib->psta; */ -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pattrib->nr_frags !=1 ) sz = padapter->xmitpriv.frag_len;
@@ -958,7 +958,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrRT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("curfragnum =%d length =%d pattrib->icv_len =%d" , curfragnum, length, pattrib->icv_len)); } } -rtw_secgetmic (&micdata, &(mic[0 ])); +rtw_secgetmic (&micdata, &mic[0 ]);RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: before add mic code!!!\n" ));RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: pattrib->last_txcmdsz =%d!!!\n" , pattrib->last_txcmdsz)); RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: mic[0]= 0x%.2x , mic[1]= 0x%.2x , mic[2]= 0x%.2x , mic[3]= 0x%.2x\n\
@@ -966,7 +966,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]));/* add mic code and add the mic code length in last_txcmdsz */ -memcpy (payload, &(mic[0 ]),8 ); +memcpy (payload, &mic[0 ],8 ); pattrib->last_txcmdsz +=8 ;RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("\n ========last pkt ========\n" ));
@@ -1032,7 +1032,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrSetFrameSubType (fctrl, pattrib->subtype);if (pattrib->subtype &WIFI_DATA_TYPE ) { -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true)) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) {/* to_ds = 1, fr_ds = 0; */ {
@@ -1047,7 +1047,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (pqospriv->qos_option) qos_option = true; - }else if ((check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true)) { + }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) {/* to_ds = 0, fr_ds = 1; */ SetFrDs (fctrl);memcpy (pwlanhdr->addr1, pattrib->dst,ETH_ALEN );
@@ -1414,7 +1414,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit pmlmeext->mgnt_80211w_IPN++;/* add MME IE with MIC all zero, MME string doesn't include element id and length */ - pframe =rtw_set_ie (pframe, _MME_IE_,16 ,MME , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _MME_IE_,16 ,MME , &pattrib->pktlen); pattrib->last_txcmdsz = pattrib->pktlen;/* total frame length - header length */ frame_body_len = pattrib->pktlen -sizeof (struct ieee80211_hdr_3addr );
@@ -1693,7 +1693,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); -list_del_init (&(pxmitbuf->list)); +list_del_init (&pxmitbuf->list); }if (pxmitbuf) {
@@ -1734,7 +1734,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)list_del_init (&pxmitbuf->list); -list_add_tail (&(pxmitbuf->list),get_list_head (pfree_queue)); +list_add_tail (&pxmitbuf->list,get_list_head (pfree_queue)); pxmitpriv->free_xmit_extbuf_cnt++;#ifdef DBG_XMIT_BUF_EXT DBG_871X ("DBG_XMIT_BUF_EXT FREE no =%d, free_xmit_extbuf_cnt =%d\n" , pxmitbuf->no, pxmitpriv->free_xmit_extbuf_cnt);
@@ -1766,7 +1766,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); -list_del_init (&(pxmitbuf->list)); +list_del_init (&pxmitbuf->list); }if (pxmitbuf) {
@@ -1822,7 +1822,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)list_del_init (&pxmitbuf->list); -list_add_tail (&(pxmitbuf->list),get_list_head (pfree_xmitbuf_queue)); +list_add_tail (&pxmitbuf->list,get_list_head (pfree_xmitbuf_queue)); pxmitpriv->free_xmitbuf_cnt++;/* DBG_871X("FREE, free_xmitbuf_cnt =%d\n", pxmitpriv->free_xmitbuf_cnt); */
@@ -1886,7 +1886,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf pxframe = LIST_CONTAINOR(plist, struct xmit_frame, list); -list_del_init (&(pxframe->list)); +list_del_init (&pxframe->list); pxmitpriv->free_xmitframe_cnt--;RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe():free_xmitframe_cnt =%d\n" , pxmitpriv->free_xmitframe_cnt)); }
@@ -1913,7 +1913,7 @@ struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv) plist =get_next (phead); pxframe = LIST_CONTAINOR(plist, struct xmit_frame, list); -list_del_init (&(pxframe->list)); +list_del_init (&pxframe->list); pxmitpriv->free_xframe_ext_cnt--;RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe_ext():free_xmitframe_cnt =%d\n" , pxmitpriv->free_xframe_ext_cnt)); }
@@ -2013,7 +2013,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframstruct list_head *plist, *phead;struct xmit_frame *pxmitframe; -spin_lock_bh (&(pframequeue->lock)); +spin_lock_bh (&pframequeue->lock); phead =get_list_head (pframequeue); plist =get_next (phead);
@@ -2027,7 +2027,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframrtw_free_xmitframe (pxmitpriv, pxmitframe); } -spin_unlock_bh (&(pframequeue->lock)); +spin_unlock_bh (&pframequeue->lock); }s32 rtw_xmitframe_enqueue (struct adapter *padapter,struct xmit_frame *pxmitframe)
@@ -2050,21 +2050,21 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *switch (up) {case 1 :case 2 : - ptxservq = &(psta->sta_xmitpriv.bk_q); + ptxservq = &psta->sta_xmitpriv.bk_q; *(ac) =3 ;RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : BK\n" ));break ;case 4 :case 5 : - ptxservq = &(psta->sta_xmitpriv.vi_q); + ptxservq = &psta->sta_xmitpriv.vi_q; *(ac) =1 ;RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : VI\n" ));break ;case 6 :case 7 : - ptxservq = &(psta->sta_xmitpriv.vo_q); + ptxservq = &psta->sta_xmitpriv.vo_q; *(ac) =0 ;RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : VO\n" ));break ;
@@ -2072,7 +2072,7 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *case 0 :case 3 :default : - ptxservq = &(psta->sta_xmitpriv.be_q); + ptxservq = &psta->sta_xmitpriv.be_q; *(ac) =2 ;RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : BE\n" ));break ;
@@ -2608,24 +2608,24 @@ void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta)dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->vo_q.sta_pending); -list_del_init (&(pstaxmitpriv->vo_q.tx_pending)); +list_del_init (&pstaxmitpriv->vo_q.tx_pending);dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->vi_q.sta_pending); -list_del_init (&(pstaxmitpriv->vi_q.tx_pending)); +list_del_init (&pstaxmitpriv->vi_q.tx_pending);dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->be_q.sta_pending); -list_del_init (&(pstaxmitpriv->be_q.tx_pending)); +list_del_init (&pstaxmitpriv->be_q.tx_pending);dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->bk_q.sta_pending); -list_del_init (&(pstaxmitpriv->bk_q.tx_pending)); +list_del_init (&pstaxmitpriv->bk_q.tx_pending);/* for BC/MC Frames */ pstaxmitpriv = &psta_bmc->sta_xmitpriv;dequeue_xmitframes_to_sleeping_queue (padapter, psta_bmc, &pstaxmitpriv->be_q.sta_pending); -list_del_init (&(pstaxmitpriv->be_q.tx_pending)); +list_del_init (&pstaxmitpriv->be_q.tx_pending);spin_unlock_bh (&pxmitpriv->lock); }
@@ -2871,7 +2871,7 @@ void enqueue_pending_xmitbuf(list_add_tail (&pxmitbuf->list,get_list_head (pqueue));spin_unlock_bh (&pqueue->lock); -complete (&(pri_adapter->xmitpriv.xmit_comp)); +complete (&pri_adapter->xmitpriv.xmit_comp); } void enqueue_pending_xmitbuf_to_head(
Signature · 1 line
2.20.1
PATCH RESEND 3/3 staging: rtl8723bs: Fix lines over 80 characters
In reply to Javier F. AriasThis patch fixes the "lines over 80 characters" warnings in lines affected by a previous patch.
Issue found by Checkpatch.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +13 -6
@@ -99,7 +99,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe->buf_addr =NULL ; pxframe->pxmitbuf =NULL ; -list_add_tail (&pxframe->list, &pxmitpriv->free_xmit_queue.queue); +list_add_tail (&pxframe->list, + &pxmitpriv->free_xmit_queue.queue); pxframe++; }
@@ -151,7 +152,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->flags =XMIT_VO_QUEUE ; -list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmitbuf_queue.queue); +list_add_tail (&pxmitbuf->list, + &pxmitpriv->free_xmitbuf_queue.queue);#ifdef DBG_XMIT_BUF pxmitbuf->no = i;#endif
@@ -189,7 +191,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe->ext_tag =1 ; -list_add_tail (&pxframe->list, &pxmitpriv->free_xframe_ext_queue.queue); +list_add_tail (&pxframe->list, + &pxmitpriv->free_xframe_ext_queue.queue); pxframe++; }
@@ -229,7 +232,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->ptail = pxmitbuf->phead; pxmitbuf->pdata = pxmitbuf->phead; -list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmit_extbuf_queue.queue); +list_add_tail (&pxmitbuf->list, + &pxmitpriv->free_xmit_extbuf_queue.queue);#ifdef DBG_XMIT_BUF_EXT pxmitbuf->no = i;#endif
@@ -1414,7 +1418,9 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit pmlmeext->mgnt_80211w_IPN++;/* add MME IE with MIC all zero, MME string doesn't include element id and length */ - pframe =rtw_set_ie (pframe, _MME_IE_,16 ,MME , &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _MME_IE_, +16 ,MME , + &pattrib->pktlen); pattrib->last_txcmdsz = pattrib->pktlen;/* total frame length - header length */ frame_body_len = pattrib->pktlen -sizeof (struct ieee80211_hdr_3addr );
@@ -1822,7 +1828,8 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)list_del_init (&pxmitbuf->list); -list_add_tail (&pxmitbuf->list,get_list_head (pfree_xmitbuf_queue)); +list_add_tail (&pxmitbuf->list, +get_list_head (pfree_xmitbuf_queue)); pxmitpriv->free_xmitbuf_cnt++;/* DBG_871X("FREE, free_xmitbuf_cnt =%d\n", pxmitpriv->free_xmitbuf_cnt); */
Signature · 1 line
2.20.1
Greg KH
maintainerRe: [RESEND PATCH 3/3] staging: rtl8723bs: Fix lines over 80 characters
Quoted 54 lines · Javier F. Arias
This patch fixes the "lines over 80 characters" warnings in lines affected by a previous patch.
Issue found by Checkpatch.Signed-off-by Javier F. Arias <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)drivers/staging/rtl8723bs/core/rtw_xmit.c +8
-4@@ -99,7 +99,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe->buf_addr =NULL ; pxframe->pxmitbuf =NULL ; -list_add_tail (&pxframe->list, &pxmitpriv->free_xmit_queue.queue); +list_add_tail (&pxframe->list, + &pxmitpriv->free_xmit_queue.queue); pxframe++; }@@ -151,7 +152,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->flags =XMIT_VO_QUEUE ; -list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmitbuf_queue.queue); +list_add_tail (&pxmitbuf->list, + &pxmitpriv->free_xmitbuf_queue.queue);#ifdef DBG_XMIT_BUF pxmitbuf->no = i;#endif @@ -189,7 +191,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe->ext_tag =1 ; -list_add_tail (&pxframe->list, &pxmitpriv->free_xframe_ext_queue.queue); +list_add_tail (&pxframe->list, + &pxmitpriv->free_xframe_ext_queue.queue); pxframe++; }@@ -229,7 +232,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->ptail = pxmitbuf->phead; pxmitbuf->pdata = pxmitbuf->phead; -list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmit_extbuf_queue.queue); +list_add_tail (&pxmitbuf->list, + &pxmitpriv->free_xmit_extbuf_queue.queue);#ifdef DBG_XMIT_BUF_EXT pxmitbuf->no = i;#endif
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit · line 1423
Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +3
-1@@ -1414,7 +1418,9 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit pmlmeext->mgnt_80211w_IPN++;/* add MME IE with MIC all zero, MME string doesn't include element id and length */ - pframe =rtw_set_ie (pframe, _MME_IE_,16 ,MME , &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _MME_IE_, +16 ,MME , + &pattrib->pktlen);
This can be done in 2 lines, not 3.
thanks,
greg k-h
Greg KH
maintainerQuoted 8 lines · Javier F. Arias
This patch splits assignments into multiple lines to solve the multiple assignment warning.
Issue found by checkpatch.Signed-off-by Javier F. Arias <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 24 +++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
Why is this series a "resend"? What changed from a previous version?
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) · line 150
Quoted 12 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +2
-1@@ -146,7 +146,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_XMITBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead;
The original is usually better here, it makes it more obvious what is happening.
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) · line 230
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +2
-1pxmitbuf->flags =XMIT_VO_QUEUE ;@@ -225,7 +226,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_XMIT_EXTBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead;
original is fine.
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) · line 261
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +2
-1list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue));#ifdef DBG_XMIT_BUF_EXT @@ -255,7 +257,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf +MAX_CMDBUF_SZ ; pxmitbuf->len =0 ; - pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->ptail = pxmitbuf->phead; + pxmitbuf->pdata = pxmitbuf->phead;
Same here, original code is fine. Same for other issues like this.
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +0
-0pxmitbuf->alloc_sz =MAX_CMDBUF_SZ +XMITBUF_ALIGN_SZ ; } }@@ -1366,11 +1369,13 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmitstruct ieee80211_hdr *pwlanhdr;u8 MME [_MME_IE_LENGTH_];
drivers/staging/rtl8723bs/core/rtw_xmit.c s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit · line 1378
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_xmit.c +4
-2u32 ori_len; - mem_start = pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; + pframe = (u8 *)(pxmitframe->buf_addr) +TXDESC_OFFSET ; + mem_start = pframe; pwlanhdr = (struct ieee80211_hdr *)pframe; ori_len =BIP_AAD_SIZE +pattrib->pktlen; - tmp_buf =BIP_AAD =rtw_zmalloc (ori_len); +BIP_AAD =rtw_zmalloc (ori_len); + tmp_buf =BIP_AAD ;
BIP_AAD is a variable name? Ick. well, not your fault...
This change is ok.
thanks,
greg k-h