staging: rtl8723bs: remove RT_TRACE logs in core/*
v3 cover staging: rtl8723bs: remove RT_TRACE logs in core/*
This patchset removes all RT_TRACE usages in core/ files.
This is the first of a series aimed at removing RT_TRACE macro.
The whole private tracing system is not tied to a configuration symbol and the default behaviour is _trace nothing_. It's verbose and relies on a private log level tracing doomed to be removed.
-------------------------------
Changes in v3:
- written better changelog in single patches
Changes in v2:
- isolate checkpatch fixes in separate patches
- removed two if conditions in core/rtw_wlan_util.c
Fabio Aiuto (30):
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_xmit.c
staging: rtl8723bs: fix condition in if statement in core/rtw_xmit.c
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_security.c
staging: rtl8723bs: fix line exceed warning in core/rtw_security.c
staging: rtl8723bs: fix spaces around operator issues in
core/rtw_security.c
staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_eeprom.c
staging: rtl8723bs: fix error prone if conditions in core/rtw_eeprom.c
staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_pwrctrl.c
staging: rtl8723bs: fix logical continuation issue in
core/rtw_pwrctrl.c
staging: rtl8723bs: remove unnecessary parentheses in if-condition in
core/rtw_pwrctrl.c
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_cmd.c
staging: rtl8723bs: fix null check conditions in core/rtw_cmd.c
staging: rtl8723bs: remove unnecessary parentheses in if condition in
core/rtw_cmd.c
staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_mlme.c
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_mlme.c
staging: rtl8723bs: tidy up some error handling in core/rtw_mlme.c
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_mlme_ext.c
staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_recv.c
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_recv.c
staging: rtl8723bs: added spaces around operator in core/rtw_recv.c
staging: rtl8723bs: split long line in core/rtw_recv.c
staging: rtl8723bs: remove unnecessary parentheses in core/rtw_recv.c
staging: rtl8723bs: fix comparison in if condition in core/rtw_recv.c
staging: rtl8723bs: remove commented RT_TRACE call in
core/rtw_ioctl_set.c
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_ioctl_set.c
staging: rtl8723bs: place constant on the right side of the test in
core/rtw_ioctl_set.c
staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_wlan_util.c
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_sta_mgt.c
staging: rtl8723bs: remove RT_TRACE logs in core/rtw_ieee80211.c
staging: rtl8723bs: add spaces around operators in
core/rtw_ieee80211.c
drivers/staging/rtl8723bs/core/rtw_cmd.c | 53 +------ drivers/staging/rtl8723bs/core/rtw_eeprom.c | 56 +++---- .../staging/rtl8723bs/core/rtw_ieee80211.c | 90 ++--------- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 79 +--------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 124 +++------------ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 39 +---- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 56 +------ drivers/staging/rtl8723bs/core/rtw_recv.c | 147 +----------------- drivers/staging/rtl8723bs/core/rtw_security.c | 41 +---- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 25 --- .../staging/rtl8723bs/core/rtw_wlan_util.c | 24 +-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 82 +--------- 12 files changed, 101 insertions(+), 715 deletions(-)
Signature · 1 line
2.20.1
PATCH v3 1/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_xmit.c
Remove all of the RT_TRACE logs in the core/rtw_xmit.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 82 ++--------------------- 1 file changed, 7 insertions(+), 75 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +7 -75
@@ -69,7 +69,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)if (!pxmitpriv->pallocated_frame_buf) { pxmitpriv->pxmit_frame_buf =NULL ; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_frame fail!\n" )); res = _FAIL; goto exit; }
@@ -105,7 +104,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->pallocated_xmitbuf =vzalloc (NR_XMITBUFF *sizeof (struct xmit_buf ) +4 );if (!pxmitpriv->pallocated_xmitbuf) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_buf fail!\n" )); res = _FAIL; goto exit; }
@@ -155,7 +153,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)if (!pxmitpriv->xframe_ext_alloc_addr) { pxmitpriv->xframe_ext =NULL ; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("alloc xframe_ext fail!\n" )); res = _FAIL; goto exit; }
@@ -188,7 +185,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->pallocated_xmit_extbuf =vzalloc (NR_XMIT_EXTBUFF *sizeof (struct xmit_buf ) +4 );if (!pxmitpriv->pallocated_xmit_extbuf) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_extbuf fail!\n" )); res = _FAIL; goto exit; }
@@ -481,12 +477,9 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p pattrib->mac_id = psta->mac_id;if (psta->ieee8021x_blocked == true) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("\n psta->ieee8021x_blocked == true\n" )); - pattrib->encrypt =0 ;if ((pattrib->ether_type !=0x888e ) && (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == false)) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != 0x888e\n" , pattrib->ether_type));#ifdef DBG_TX_DROP_FRAME DBG_871X ("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == true, pattrib->ether_type(%04x) != 0x888e\n" , __func__, pattrib->ether_type);#endif
@@ -568,20 +561,11 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pif (pattrib->encrypt >0 )memcpy (pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey,16 ); -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, - ("update_attrib: encrypt =%d securitypriv.sw_encrypt =%d\n" , - pattrib->encrypt, padapter->securitypriv.sw_encrypt)); -if (pattrib->encrypt && - ((padapter->securitypriv.sw_encrypt == true) || (psecuritypriv->hw_decrypted == false))) { + ((padapter->securitypriv.sw_encrypt == true) || (psecuritypriv->hw_decrypted == false))) pattrib->bswenc = true; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, - ("update_attrib: encrypt =%d securitypriv.hw_decrypted =%d bswenc =true\n" , - pattrib->encrypt, padapter->securitypriv.sw_encrypt)); - }else { +else pattrib->bswenc = false; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("update_attrib: bswenc =false\n" )); - } exit:
@@ -685,7 +669,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p ((tmp[21] == 67) && (tmp[23] == 68))) {/* 68 : UDP BOOTP client */ /* 67 : UDP BOOTP server */ -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("======================update_attrib: get DHCP Packet\n" )); pattrib->dhcp_pkt =1 ; } }
@@ -720,7 +703,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p }else { psta =rtw_get_stainfo (pstapriv, pattrib->ra);if (!psta) {/* if we cannot get psta => drop the pkt */ -RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:%pM\n" ,MAC_ARG (pattrib->ra)));#ifdef DBG_TX_DROP_FRAME DBG_871X ("DBG_TX_DROP_FRAME %s get sta_info fail, ra:%pM\n" , __func__,MAC_ARG (pattrib->ra));#endif
@@ -734,7 +716,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (!psta) {/* if we cannot get psta => drop the pkt */ -RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:%pM\n" ,MAC_ARG (pattrib->ra)));#ifdef DBG_TX_DROP_FRAME DBG_871X ("DBG_TX_DROP_FRAME %s get sta_info fail, ra:%pM\n" , __func__,MAC_ARG (pattrib->ra));#endif
@@ -842,11 +823,8 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrfor (curfragnum =0 ; curfragnum < pattrib->nr_frags; curfragnum++) { payload = (u8 *)round_up ((SIZE_PTR )(payload),4 ); -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("===curfragnum =%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n" , - curfragnum, *payload, *(payload+1 ), *(payload+2 ), *(payload+3 ), *(payload+4 ), *(payload+5 ), *(payload+6 ), *(payload+7 ))); - payload = payload+pattrib->hdrlen+pattrib->iv_len; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("curfragnum =%d pattrib->hdrlen =%d pattrib->iv_len =%d" , curfragnum, pattrib->hdrlen, pattrib->iv_len)); +if ((curfragnum+1 ) == pattrib->nr_frags) { length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-((pattrib->bswenc) ? pattrib->icv_len :0 );rtw_secmicappend (&micdata, payload, length);
@@ -855,26 +833,13 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-((pattrib->bswenc) ? pattrib->icv_len :0 );rtw_secmicappend (&micdata, payload, length); payload = payload+length+pattrib->icv_len; -RT_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 ]); -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\ -mic[4]= 0x%.2x , mic[5]= 0x%.2x , mic[6]= 0x%.2x , mic[7]= 0x%.2x !!!!\n" , - 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 ); pattrib->last_txcmdsz +=8 ; - -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("\n ========last pkt ========\n" )); - payload = payload-pattrib->last_txcmdsz+8 ; -for (curfragnum =0 ; curfragnum < pattrib->last_txcmdsz; curfragnum = curfragnum+8 ) -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, (" %.2x, %.2x, %.2x, %.2x, %.2x, %.2x, %.2x, %.2x " , - *(payload+curfragnum), *(payload+curfragnum+1 ), *(payload+curfragnum+2 ), *(payload+curfragnum+3 ), - *(payload+curfragnum+4 ), *(payload+curfragnum+5 ), *(payload+curfragnum+6 ), *(payload+curfragnum+7 ))); } }return _SUCCESS;
@@ -885,7 +850,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmistruct pkt_attrib *pattrib = &pxmitframe->attrib;if (pattrib->bswenc) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("### xmitframe_swencrypt\n" ));switch (pattrib->encrypt) {case _WEP40_:case _WEP104_:
@@ -900,8 +864,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmidefault :break ; } - }else { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n" )); }return _SUCCESS;
@@ -955,7 +917,6 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (pattrib->qos_en) qos_option = true; }else { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("fw_state:%x is not allowed to xmit frame\n" ,get_fwstate (pmlmepriv))); res = _FAIL; goto exit; }
@@ -1106,7 +1067,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct mem_start = pbuf_start + hw_hdr_offset;if (rtw_make_wlanhdr (padapter, mem_start, pattrib) == _FAIL) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n" ));DBG_8192C ("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n" ); res = _FAIL; goto exit;
@@ -1134,10 +1094,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structif (pattrib->iv_len) {memcpy (pframe, pattrib->iv, pattrib->iv_len); -RT_TRACE (_module_rtl871x_xmit_c_, _drv_notice_, - ("rtw_xmitframe_coalesce: keyid =%d pattrib->iv[3]=%.2x pframe =%.2x %.2x %.2x %.2x\n" , - padapter->securitypriv.dot11PrivacyKeyIndex, pattrib->iv[3 ], *pframe, *(pframe+1 ), *(pframe+2 ), *(pframe+3 ))); - pframe += pattrib->iv_len; mpdu_len -= pattrib->iv_len;
@@ -1177,8 +1133,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structClearMFrag (mem_start);break ; - }else { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n" , __func__)); } addr = (SIZE_PTR )(pframe);
@@ -1188,7 +1142,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct }if (xmitframe_addmic (padapter, pxmitframe) == _FAIL) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n" ));DBG_8192C ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n" ); res = _FAIL; goto exit;
@@ -1712,7 +1665,6 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pfspin_lock_bh (&pfree_xmit_queue->lock);if (list_empty (&pfree_xmit_queue->queue)) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe:%d\n" , pxmitpriv->free_xmitframe_cnt)); pxframe =NULL ; }else { phead =get_list_head (pfree_xmit_queue);
@@ -1723,7 +1675,6 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pflist_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)); }spin_unlock_bh (&pfree_xmit_queue->lock);
@@ -1741,7 +1692,6 @@ struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv)spin_lock_bh (&queue->lock);if (list_empty (&queue->queue)) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe_ext:%d\n" , pxmitpriv->free_xframe_ext_cnt)); pxframe =NULL ; }else { phead =get_list_head (queue);
@@ -1750,7 +1700,6 @@ struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv)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)); }spin_unlock_bh (&queue->lock);
@@ -1795,10 +1744,8 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframstruct adapter *padapter = pxmitpriv->adapter;struct sk_buff *pndis_pkt =NULL ; -if (!pxmitframe) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("======rtw_free_xmitframe():pxmitframe == NULL!!!!!!!!!!\n" )); +if (!pxmitframe) goto exit; - }if (pxmitframe->pkt) { pndis_pkt = pxmitframe->pkt;
@@ -1822,14 +1769,10 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframlist_del_init (&pxmitframe->list);list_add_tail (&pxmitframe->list,get_list_head (queue)); -if (pxmitframe->ext_tag ==0 ) { +if (pxmitframe->ext_tag ==0 ) pxmitpriv->free_xmitframe_cnt++; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_debug_, ("rtw_free_xmitframe():free_xmitframe_cnt =%d\n" , pxmitpriv->free_xmitframe_cnt)); - }else if (pxmitframe->ext_tag ==1 ) { +else if (pxmitframe->ext_tag ==1 ) pxmitpriv->free_xframe_ext_cnt++; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_debug_, ("rtw_free_xmitframe():free_xframe_ext_cnt =%d\n" , pxmitpriv->free_xframe_ext_cnt)); - }else { - }spin_unlock_bh (&queue->lock);
@@ -1864,11 +1807,8 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframs32 rtw_xmitframe_enqueue (struct adapter *padapter,struct xmit_frame *pxmitframe) { -if (rtw_xmit_classifier (padapter, pxmitframe) == _FAIL) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, - ("rtw_xmitframe_enqueue: drop xmit pkt for classifier fail\n" )); +if (rtw_xmit_classifier (padapter, pxmitframe) == _FAIL)return _FAIL; - }return _SUCCESS; }
@@ -1882,21 +1822,18 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *case 2 : 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; *(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; *(ac) =0 ; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : VO\n" ));break ;case 0 :
@@ -1904,7 +1841,6 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *default : ptxservq = &psta->sta_xmitpriv.be_q; *(ac) =2 ; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : BE\n" ));break ; }
@@ -1933,7 +1869,6 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)if (!psta) { res = _FAIL;DBG_8192C ("rtw_xmit_classifier: psta == NULL\n" ); -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("rtw_xmit_classifier: psta == NULL\n" )); goto exit; }
@@ -2053,7 +1988,6 @@ static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattribu8 qsel; qsel = pattrib->priority; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("### do_queue_select priority =%d , qsel = %d\n" , pattrib->priority, qsel)); pattrib->qsel = qsel; }
@@ -2090,14 +2024,12 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)if (!pxmitframe) { drop_cnt++; -RT_TRACE (_module_xmit_osdep_c_, _drv_err_, ("%s: no more pxmitframe\n" , __func__));return -1 ; } res =update_attrib (padapter, *ppkt, &pxmitframe->attrib);if (res == _FAIL) { -RT_TRACE (_module_xmit_osdep_c_, _drv_err_, ("%s: update attrib fail\n" , __func__));#ifdef DBG_TX_DROP_FRAME DBG_871X ("DBG_TX_DROP_FRAME %s update attrib fail\n" , __func__);#endif
Signature · 1 line
2.20.1
PATCH v3 2/30 staging: rtl8723bs: fix condition in if statement in core/rtw_xmit.c
In reply to Fabio Aiutofix post-commit hook checkpatch issue:
CHECK: Using comparison to true is error prone 71: FILE: drivers/staging/rtl8723bs/core/rtw_xmit.c:565:
+ ((padapter->securitypriv.sw_encrypt == true) ||
(psecuritypriv->hw_decrypted == false)))
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -562,7 +562,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pmemcpy (pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey,16 );if (pattrib->encrypt && - ((padapter->securitypriv.sw_encrypt == true) || (psecuritypriv->hw_decrypted == false))) + ((padapter->securitypriv.sw_encrypt) || (!psecuritypriv->hw_decrypted))) pattrib->bswenc = true;else pattrib->bswenc = false;
Signature · 1 line
2.20.1
PATCH v3 3/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_security.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_security.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_security.c | 40 +------------------ 1 file changed, 1 insertion(+), 39 deletions(-)
drivers/staging/rtl8723bs/core/rtw_security.c +1 -39
@@ -236,16 +236,6 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)/* calculate icv and compare the icv */ *((u32 *)crc) =le32_to_cpu (getcrc32 (payload, length-4 )); -if (crc[3 ] != payload[length-1 ] || crc[2 ] != payload[length-2 ] || crc[1 ] != payload[length-3 ] || crc[0 ] != payload[length-4 ]) { -RT_TRACE (_module_rtl871x_security_c_, - _drv_err_, - ("%s:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n" , - __func__, - crc[3 ], payload[length -1 ], - crc[2 ], payload[length -2 ], - crc[1 ], payload[length -3 ], - crc[0 ], payload[length -4 ])); - } } }
@@ -609,8 +599,6 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)if (pattrib->encrypt == _TKIP_) { { -RT_TRACE (_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n" , __func__)); -if (IS_MCAST (pattrib->ra)) prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;else
@@ -631,7 +619,6 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)if ((curfragnum+1 ) == pattrib->nr_frags) {/* 4 the last fragment */ length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len; -RT_TRACE (_module_rtl871x_security_c_, _drv_info_, ("pattrib->iv_len =%x, pattrib->icv_len =%x\n" , pattrib->iv_len, pattrib->icv_len)); *((__le32 *)crc) =getcrc32 (payload, length);/* modified by Amy*/ arcfour_init (&mycontext, rc4key,16 );
@@ -739,18 +726,9 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) *((u32 *)crc) =le32_to_cpu (getcrc32 (payload, length-4 )); -if (crc[3 ] != payload[length-1 ] || crc[2 ] != payload[length-2 ] || crc[1 ] != payload[length-3 ] || crc[0 ] != payload[length-4 ]) { -RT_TRACE (_module_rtl871x_security_c_, - _drv_err_, - ("rtw_wep_decrypt:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n" , - crc[3 ], payload[length -1 ], - crc[2 ], payload[length -2 ], - crc[1 ], payload[length -3 ], - crc[0 ], payload[length -4 ])); +if (crc[3 ] != payload[length-1 ] || crc[2 ] != payload[length-2 ] || crc[1 ] != payload[length-3 ] || crc[0 ] != payload[length-4 ]) res = _FAIL; - } }else { -RT_TRACE (_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo == NULL!!!\n" , __func__)); res = _FAIL; } }
@@ -1380,8 +1358,6 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)/* 4 start to encrypt each fragment */ if (pattrib->encrypt == _AES_) { -RT_TRACE (_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n" , __func__)); -if (IS_MCAST (pattrib->ra)) prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;else
@@ -1611,13 +1587,6 @@ static signed int aes_decipher(u8 *key, uint hdrlen,/* compare the mic */ for (i =0 ; i <8 ; i++) {if (pframe[hdrlen+8 +plen-8 +i] != message[hdrlen+8 +plen-8 +i]) { -RT_TRACE (_module_rtl871x_security_c_, - _drv_err_, - ("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n" , - __func__, - i, - pframe[hdrlen +8 + plen -8 + i], - message[hdrlen +8 + plen -8 + i])); DBG_871X("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n", __func__, i,
@@ -1649,10 +1618,6 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)if (prxattrib->encrypt == _AES_) { stainfo =rtw_get_stainfo (&padapter->stapriv, &prxattrib->ta[0 ]);if (stainfo) { -RT_TRACE (_module_rtl871x_security_c_, - _drv_err_, - ("%s: stainfo!= NULL!!!\n" , __func__)); -if (IS_MCAST (prxattrib->ra)) {static unsigned long start;static u32 no_gkey_bc_cnt;
@@ -1706,9 +1671,6 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) res =aes_decipher (prwskey, prxattrib->hdrlen, pframe, length); }else { -RT_TRACE (_module_rtl871x_security_c_, - _drv_err_, - ("%s: stainfo == NULL!!!\n" , __func__)); res = _FAIL; } }
Signature · 1 line
2.20.1
PATCH v3 4/30 staging: rtl8723bs: fix line exceed warning in core/rtw_security.c
In reply to Fabio Aiutofix the following post-commit hook checkpatch issue:
WARNING: line length of 149 exceeds 100 columns 61: FILE: drivers/staging/rtl8723bs/core/rtw_security.c:729:
+ if (crc[3] != payload[length-1] ||
crc[2] != payload[length-2] || crc[1] != payload[length-3] || crc[0] != payload[length-4])
--- drivers/staging/rtl8723bs/core/rtw_security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_security.c +2 -1
@@ -726,7 +726,8 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) *((u32 *)crc) =le32_to_cpu (getcrc32 (payload, length-4 )); -if (crc[3 ] != payload[length-1 ] || crc[2 ] != payload[length-2 ] || crc[1 ] != payload[length-3 ] || crc[0 ] != payload[length-4 ]) +if (crc[3 ] != payload[length-1 ] || crc[2 ] != payload[length-2 ] || + crc[1 ] != payload[length-3 ] || crc[0 ] != payload[length-4 ]) res = _FAIL; }else { res = _FAIL;
Signature · 1 line
2.20.1
PATCH v3 5/30 staging: rtl8723bs: fix spaces around operator issues in core/rtw_security.c
In reply to Fabio Aiutofix the following post commit hook checkpatch issues:
CHECK: spaces preferred around that '-' (ctx:VxV) 25: FILE: drivers/staging/rtl8723bs/core/rtw_security.c:729:
+ if (crc[3] != payload[length-1] ||
crc[2] != payload[length-2] ||
^
CHECK: spaces preferred around that '-' (ctx:VxV) 25: FILE: drivers/staging/rtl8723bs/core/rtw_security.c:729:
+ if (crc[3] != payload[length-1] ||
crc[2] != payload[length-2] ||
^CHECK: spaces preferred around that '-' (ctx:VxV) 26: FILE: drivers/staging/rtl8723bs/core/rtw_security.c:730:
+ crc[1] != payload[length-3] ||
crc[0] != payload[length-4])
^
CHECK: spaces preferred around that '-' (ctx:VxV) 26: FILE: drivers/staging/rtl8723bs/core/rtw_security.c:730:
+ crc[1] != payload[length-3] ||
crc[0] != payload[length-4]) ^
--- drivers/staging/rtl8723bs/core/rtw_security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_security.c +2 -2
@@ -726,8 +726,8 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) *((u32 *)crc) =le32_to_cpu (getcrc32 (payload, length-4 )); -if (crc[3 ] != payload[length-1 ] || crc[2 ] != payload[length-2 ] || - crc[1 ] != payload[length-3 ] || crc[0 ] != payload[length-4 ]) +if (crc[3 ] != payload[length -1 ] || crc[2 ] != payload[length -2 ] || + crc[1 ] != payload[length -3 ] || crc[0 ] != payload[length -4 ]) res = _FAIL; }else { res = _FAIL;
Signature · 1 line
2.20.1
PATCH v3 6/30 staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_eeprom.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_eeprom.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_eeprom.c | 56 ++++++++------------- 1 file changed, 22 insertions(+), 34 deletions(-)
drivers/staging/rtl8723bs/core/rtw_eeprom.c +22 -34
@@ -35,10 +35,9 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 count)u16 x, mask; _func_enter_; -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } + mask =0x01 << (count -1 ); x =rtw_read8 (padapter,EE_9346CR );
@@ -48,20 +47,18 @@ _func_enter_; x &= ~_EEDI;if (data & mask) x |= _EEDI; -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); - goto out; - } +if (padapter->bSurpriseRemoved == true) + goto out; +rtw_write8 (padapter,EE_9346CR , (u8 )x);udelay (CLOCK_RATE );up_clk (padapter, &x);down_clk (padapter, &x); mask = mask >>1 ; }while (mask); -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } + x &= ~_EEDI;rtw_write8 (padapter,EE_9346CR , (u8 )x); out:
@@ -72,10 +69,9 @@ u16 shift_in_bits(_adapter *padapter) {u16 x, d =0 , i; _func_enter_; -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } + x =rtw_read8 (padapter,EE_9346CR ); x &= ~(_EEDO | _EEDI);
@@ -84,10 +80,9 @@ _func_enter_;for (i =0 ; i <16 ; i++) { d = d <<1 ;up_clk (padapter, &x); -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } + x =rtw_read8 (padapter,EE_9346CR ); x &= ~(_EEDI);
@@ -122,26 +117,22 @@ void eeprom_clean(_adapter *padapter) {u16 x; _func_enter_; -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } + x =rtw_read8 (padapter,EE_9346CR ); -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } + x &= ~(_EECS | _EEDI);rtw_write8 (padapter,EE_9346CR , (u8 )x); -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } +up_clk (padapter, &x); -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } +down_clk (padapter, &x); out: _func_exit_;
@@ -155,17 +146,14 @@ u16 eeprom_read16(_adapter *padapter, u16 reg) /*ReadEEprom*/ _func_enter_; -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } +/* select EEPROM, reset bits, set _EECS*/ x =rtw_read8 (padapter,EE_9346CR ); -if (padapter->bSurpriseRemoved == true) { -RT_TRACE (_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true" )); +if (padapter->bSurpriseRemoved == true) goto out; - } x &= ~(_EEDI | _EEDO | _EESK | _EEM0); x |= _EEM1 | _EECS;
Signature · 1 line
2.20.1
PATCH v3 7/30 staging: rtl8723bs: fix error prone if conditions in core/rtw_eeprom.c
In reply to Fabio Aiutofix the following post-commit hook checkpatch issues:
CHECK: Using comparison to true is error prone 21: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:38:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 36: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:50:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 47: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:59:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 60: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:72:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 73: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:83:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 86: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:120:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 93: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:124:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 101: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:129:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 108: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:133:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 121: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:149:
+ if (padapter->bSurpriseRemoved == true)
CHECK: Using comparison to true is error prone 130: FILE: drivers/staging/rtl8723bs/core/rtw_eeprom.c:155:
+ if (padapter->bSurpriseRemoved == true)
--- drivers/staging/rtl8723bs/core/rtw_eeprom.c | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_eeprom.c +11 -11
@@ -35,7 +35,7 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 count)u16 x, mask; _func_enter_; -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out; mask =0x01 << (count -1 );
@@ -47,7 +47,7 @@ _func_enter_; x &= ~_EEDI;if (data & mask) x |= _EEDI; -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out;rtw_write8 (padapter,EE_9346CR , (u8 )x);
@@ -56,7 +56,7 @@ _func_enter_;down_clk (padapter, &x); mask = mask >>1 ; }while (mask); -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out; x &= ~_EEDI;
@@ -69,7 +69,7 @@ u16 shift_in_bits(_adapter *padapter) {u16 x, d =0 , i; _func_enter_; -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out; x =rtw_read8 (padapter,EE_9346CR );
@@ -80,7 +80,7 @@ _func_enter_;for (i =0 ; i <16 ; i++) { d = d <<1 ;up_clk (padapter, &x); -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out; x =rtw_read8 (padapter,EE_9346CR );
@@ -117,20 +117,20 @@ void eeprom_clean(_adapter *padapter) {u16 x; _func_enter_; -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out; x =rtw_read8 (padapter,EE_9346CR ); -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out; x &= ~(_EECS | _EEDI);rtw_write8 (padapter,EE_9346CR , (u8 )x); -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out;up_clk (padapter, &x); -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out;down_clk (padapter, &x);
@@ -146,13 +146,13 @@ u16 eeprom_read16(_adapter *padapter, u16 reg) /*ReadEEprom*/ _func_enter_; -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out;/* select EEPROM, reset bits, set _EECS*/ x =rtw_read8 (padapter,EE_9346CR ); -if (padapter->bSurpriseRemoved == true) +if (padapter->bSurpriseRemoved) goto out; x &= ~(_EEDI | _EEDO | _EESK | _EEM0);
Signature · 1 line
2.20.1
PATCH v3 8/30 staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_pwrctrl.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_pwrctrl.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 54 ++------------------ 1 file changed, 4 insertions(+), 50 deletions(-)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +4 -50
@@ -267,40 +267,26 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)DBG_871X ("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n" , __func__, pslv); }else {if ((pwrpriv->rpwm == pslv) - || ((pwrpriv->rpwm >=PS_STATE_S2 ) && (pslv >=PS_STATE_S2 ))) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: Already set rpwm[0x%02X], new = 0x%02X!\n" , __func__, pwrpriv->rpwm, pslv)); + || ((pwrpriv->rpwm >=PS_STATE_S2 ) && (pslv >=PS_STATE_S2 )))return ; - } + }if ((padapter->bSurpriseRemoved) || !(padapter->hw_init_completed)) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n" , - __func__, padapter->bSurpriseRemoved, padapter->hw_init_completed)); - pwrpriv->cpwm =PS_STATE_S4 ;return ; }if (padapter->bDriverStopped) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: change power state(0x%02X) when DriverStopped\n" , __func__, pslv)); - -if (pslv <PS_STATE_S2 ) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: Reject to enter PS_STATE(0x%02X) lower than S2 when DriverStopped!!\n" , __func__, pslv)); +if (pslv <PS_STATE_S2 )return ; - } } rpwm = pslv | pwrpriv->tog;/* only when from PS_STATE S0/S1 to S2 and higher needs ACK */ if ((pwrpriv->cpwm <PS_STATE_S2 ) && (pslv >=PS_STATE_S2 )) rpwm |=PS_ACK ; -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("rtw_set_rpwm: rpwm = 0x%02x cpwm = 0x%02x\n" , rpwm, pwrpriv->cpwm)); pwrpriv->rpwm = pslv;
@@ -382,14 +368,8 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a {struct pwrctrl_priv *pwrpriv =adapter_to_pwrctl (padapter); -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("%s: PowerMode =%d Smart_PS =%d\n" , - __func__, ps_mode, smart_ps)); - -if (ps_mode > PM_Card_Disable) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_err_, ("ps_mode:%d error\n" , ps_mode)); +if (ps_mode > PM_Card_Disable)return ; - }if (pwrpriv->pwr_mode == ps_mode)if (PS_MODE_ACTIVE == ps_mode)
@@ -701,8 +681,6 @@ void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportp exit:mutex_unlock (&pwrpriv->lock); -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("cpwm_int_hdl: cpwm = 0x%02x\n" , pwrpriv->cpwm)); }static void cpwm_event_callback (struct work_struct *work)
@@ -817,10 +795,6 @@ s32 rtw_register_task_alive(struct adapter *padapter, u32 task)register_task_alive (pwrctrl, task);if (pwrctrl->bFwCurrentInPSMode) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("%s: task = 0x%x cpwm = 0x%02x alives = 0x%08x\n" , - __func__, task, pwrctrl->cpwm, pwrctrl->alives)); -if (pwrctrl->cpwm < pslv) {if (pwrctrl->cpwm <PS_STATE_S2 ) res = _FAIL;
@@ -869,10 +843,6 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task)unregister_task_alive (pwrctrl, task);if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("%s: cpwm = 0x%02x alives = 0x%08x\n" , - __func__, pwrctrl->cpwm, pwrctrl->alives)); -if (pwrctrl->cpwm > pslv)if ((pslv >=PS_STATE_S2 ) || (pwrctrl->alives ==0 ))rtw_set_rpwm (padapter, pslv);
@@ -910,10 +880,6 @@ s32 rtw_register_tx_alive(struct adapter *padapter)register_task_alive (pwrctrl,XMIT_ALIVE );if (pwrctrl->bFwCurrentInPSMode) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("rtw_register_tx_alive: cpwm = 0x%02x alives = 0x%08x\n" , - pwrctrl->cpwm, pwrctrl->alives)); -if (pwrctrl->cpwm < pslv) {if (pwrctrl->cpwm <PS_STATE_S2 ) res = _FAIL;
@@ -959,10 +925,6 @@ s32 rtw_register_cmd_alive(struct adapter *padapter)register_task_alive (pwrctrl,CMD_ALIVE );if (pwrctrl->bFwCurrentInPSMode) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_info_, - ("rtw_register_cmd_alive: cpwm = 0x%02x alives = 0x%08x\n" , - pwrctrl->cpwm, pwrctrl->alives)); -if (pwrctrl->cpwm < pslv) {if (pwrctrl->cpwm <PS_STATE_S2 ) res = _FAIL;
@@ -1008,10 +970,6 @@ void rtw_unregister_tx_alive(struct adapter *padapter)unregister_task_alive (pwrctrl,XMIT_ALIVE );if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("%s: cpwm = 0x%02x alives = 0x%08x\n" , - __func__, pwrctrl->cpwm, pwrctrl->alives)); -if (pwrctrl->cpwm > pslv)if ((pslv >=PS_STATE_S2 ) || (pwrctrl->alives ==0 ))rtw_set_rpwm (padapter, pslv);
@@ -1048,10 +1006,6 @@ void rtw_unregister_cmd_alive(struct adapter *padapter)unregister_task_alive (pwrctrl,CMD_ALIVE );if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) { -RT_TRACE (_module_rtl871x_pwrctrl_c_, _drv_info_, - ("%s: cpwm = 0x%02x alives = 0x%08x\n" , - __func__, pwrctrl->cpwm, pwrctrl->alives)); -if (pwrctrl->cpwm > pslv) {if ((pslv >=PS_STATE_S2 ) || (pwrctrl->alives ==0 ))rtw_set_rpwm (padapter, pslv);
Signature · 1 line
2.20.1
PATCH v3 9/30 staging: rtl8723bs: fix logical continuation issue in core/rtw_pwrctrl.c
In reply to Fabio Aiutofix following post-commit hook checkpatch issue:
CHECK: Logical continuations should be on the previous line 22: FILE: drivers/staging/rtl8723bs/core/rtw_pwrctrl.c:270:
if ((pwrpriv->rpwm == pslv)
+ || ((pwrpriv->rpwm >= PS_STATE_S2)
&& (pslv >= PS_STATE_S2)))
--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +2 -2
@@ -266,8 +266,8 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)if (pwrpriv->brpwmtimeout) {DBG_871X ("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n" , __func__, pslv); }else { -if ((pwrpriv->rpwm == pslv) - || ((pwrpriv->rpwm >=PS_STATE_S2 ) && (pslv >=PS_STATE_S2 ))) +if ((pwrpriv->rpwm == pslv) || + ((pwrpriv->rpwm >=PS_STATE_S2 ) && (pslv >=PS_STATE_S2 )))return ; }
Signature · 1 line
2.20.1
PATCH v3 10/30 staging: rtl8723bs: remove unnecessary parentheses in if-condition in core/rtw_pwrctrl.c
In reply to Fabio Aiutofix following post-commit hook checkpatch issues:
CHECK: Unnecessary parentheses around 'pwrpriv->rpwm == pslv' 26: FILE: drivers/staging/rtl8723bs/core/rtw_pwrctrl.c:269:
+ if ((pwrpriv->rpwm == pslv) ||
+ ((pwrpriv->rpwm >= PS_STATE_S2)
&& (pslv >= PS_STATE_S2)))
CHECK: Unnecessary parentheses around 'pwrpriv->rpwm >= PS_STATE_S2' 26: FILE: drivers/staging/rtl8723bs/core/rtw_pwrctrl.c:269:
+ if ((pwrpriv->rpwm == pslv) ||
+ ((pwrpriv->rpwm >= PS_STATE_S2)
&& (pslv >= PS_STATE_S2)))
CHECK: Unnecessary parentheses around 'pslv >= PS_STATE_S2' 26: FILE: drivers/staging/rtl8723bs/core/rtw_pwrctrl.c:269:
+ if ((pwrpriv->rpwm == pslv) ||
+ ((pwrpriv->rpwm >= PS_STATE_S2)
&& (pslv >= PS_STATE_S2)))
--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +2 -2
@@ -266,8 +266,8 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)if (pwrpriv->brpwmtimeout) {DBG_871X ("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n" , __func__, pslv); }else { -if ((pwrpriv->rpwm == pslv) || - ((pwrpriv->rpwm >=PS_STATE_S2 ) && (pslv >=PS_STATE_S2 ))) +if (pwrpriv->rpwm == pslv || + (pwrpriv->rpwm >=PS_STATE_S2 && pslv >=PS_STATE_S2 ))return ; }
Signature · 1 line
2.20.1
PATCH v3 11/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_cmd.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_cmd.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
removed a variable, left unused after RT_TRACE removal
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 53 +++--------------------- 1 file changed, 6 insertions(+), 47 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +6 -47
@@ -221,8 +221,6 @@ int rtw_init_evt_priv(struct evt_priv *pevtpriv)void _rtw_free_evt_priv (struct evt_priv *pevtpriv) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("+_rtw_free_evt_priv\n" )); -_cancel_workitem_sync (&pevtpriv->c2h_wk);while (pevtpriv->c2h_wk_alive)msleep (10 );
@@ -233,8 +231,6 @@ void _rtw_free_evt_priv(struct evt_priv *pevtpriv)kfree (c2h); }kfree (pevtpriv->c2h_queue); - -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("-_rtw_free_evt_priv\n" )); }void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv)
@@ -299,13 +295,11 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)void rtw_free_evt_priv (struct evt_priv *pevtpriv) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_evt_priv\n" ));_rtw_free_evt_priv (pevtpriv); }void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_cmd_priv\n" ));_rtw_free_cmd_priv (pcmdpriv); }
@@ -415,8 +409,6 @@ int rtw_cmd_thread(void *context)atomic_set (&(pcmdpriv->cmdthd_running), true);complete (&pcmdpriv->terminate_cmdthread_comp); -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("start r871x rtw_cmd_thread !!!!\n" )); -while (1 ) {if (wait_for_completion_interruptible (&pcmdpriv->cmd_queue_comp)) {DBG_871X_LEVEL (_drv_always_,FUNC_ADPT_FMT " wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp) return != 0, break\n" ,FUNC_ADPT_ARG (padapter));
@@ -439,11 +431,8 @@ int rtw_cmd_thread(void *context)continue ; } -if (rtw_register_cmd_alive (padapter) != _SUCCESS) { -RT_TRACE (_module_hal_xmit_c_, _drv_notice_, - ("%s: wait to leave LPS_LCLK\n" , __func__)); +if (rtw_register_cmd_alive (padapter) != _SUCCESS)continue ; - } _next:if ((padapter->bDriverStopped == true) || (padapter->bSurpriseRemoved == true)) {
@@ -512,14 +501,12 @@ int rtw_cmd_thread(void *context)if (pcmd->cmdcode <ARRAY_SIZE (rtw_cmd_callback)) { pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback;if (pcmd_callback ==NULL ) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("mlme_cmd_hdl(): pcmd_callback = 0x%p, cmdcode = 0x%x\n" , pcmd_callback, pcmd->cmdcode));rtw_free_cmd_obj (pcmd); }else {/* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!= NULL) */ pcmd_callback (pcmd->padapter, pcmd);/* need consider that free cmd_obj in rtw_cmd_callback */ } }else { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("%s: cmdcode = 0x%x callback not defined!\n" , __func__, pcmd->cmdcode));rtw_free_cmd_obj (pcmd); }
@@ -583,8 +570,6 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,rtw_free_network_queue (padapter, false); -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network queue\n" , __func__)); -init_h2fwcmd_w_parm_no_rsp (ph2c, psurveyPara,GEN_CMD_CODE (_SiteSurvey));/* psurveyPara->bsslimit = 48; */
@@ -672,15 +657,9 @@ u8 rtw_createbss_cmd(struct adapter *padapter) {struct cmd_obj *pcmd;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network;u8 res = _SUCCESS; -if (pmlmepriv->assoc_ssid.SsidLength ==0 ) -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, (" createbss for Any SSid:%s\n" , pmlmepriv->assoc_ssid.Ssid)); -else -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n" , pmlmepriv->assoc_ssid.Ssid)); - pcmd =rtw_zmalloc (sizeof (struct cmd_obj ));if (pcmd ==NULL ) { res = _FAIL;
@@ -766,15 +745,9 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)u32 tmp_len;u8 *ptmp =NULL ; -if (pmlmepriv->assoc_ssid.SsidLength ==0 ) -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n" )); -else -RT_TRACE (_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n" , pmlmepriv->assoc_ssid.Ssid)); - pcmd =rtw_zmalloc (sizeof (struct cmd_obj ));if (pcmd ==NULL ) { res = _FAIL; -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n" )); goto exit; }/* for IEs is fix buf size */
@@ -883,8 +856,6 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueustruct cmd_priv *cmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; -RT_TRACE (_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n" )); -/* prepare cmd parameter */ param =rtw_zmalloc (sizeof (*param));if (param ==NULL ) {
@@ -1209,8 +1180,6 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconfu8 res = _SUCCESS; -RT_TRACE (_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_chplan_cmd\n" )); -/* check if allow software config */ if (swconfig &&rtw_hal_is_disable_sw_channel_plan (padapter) == true) { res = _FAIL;
@@ -1981,7 +1950,6 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)_set_timer (&pmlmepriv->scan_to_timer,1 ); }else if (pcmd->res !=H2C_SUCCESS ) {_set_timer (&pmlmepriv->scan_to_timer,1 ); -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n." )); }/* free cmd */
@@ -1997,7 +1965,6 @@ void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)set_fwstate (pmlmepriv, _FW_LINKED);spin_unlock_bh (&pmlmepriv->lock); -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\n ***Error: disconnect_cmd_callback Fail ***\n." ));return ; }/* free cmd */
@@ -2030,10 +1997,8 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)if (pcmd->parmbuf ==NULL ) goto exit; -if ((pcmd->res !=H2C_SUCCESS )) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback Fail ************\n\n." )); +if ((pcmd->res !=H2C_SUCCESS ))_set_timer (&pmlmepriv->assoc_timer,1 ); - }del_timer_sync (&pmlmepriv->assoc_timer);
@@ -2044,10 +2009,8 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) psta =rtw_get_stainfo (&padapter->stapriv, pnetwork->MacAddress);if (!psta) { psta =rtw_alloc_stainfo (&padapter->stapriv, pnetwork->MacAddress); -if (psta ==NULL ) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\nCan't alloc sta_info when createbss_cmd_callback\n" )); +if (psta ==NULL ) goto createbss_cmd_fail; - } }rtw_indicate_connect (padapter);
@@ -2057,7 +2020,6 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)if (pwlan ==NULL ) { pwlan =rtw_get_oldest_wlan_network (&pmlmepriv->scanned_queue);if (pwlan ==NULL ) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\n Error: can't get pwlan in rtw_joinbss_event_callback\n" ));spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); goto createbss_cmd_fail; }
@@ -2101,10 +2063,9 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcstruct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *) (pcmd->rsp);struct sta_info *psta =rtw_get_stainfo (pstapriv, psetstakey_rsp->addr); -if (psta ==NULL ) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n" )); +if (psta ==NULL ) goto exit; - } + exit:rtw_free_cmd_obj (pcmd); }
@@ -2117,10 +2078,8 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *) (pcmd->rsp);struct sta_info *psta =rtw_get_stainfo (pstapriv, passocsta_parm->addr); -if (psta ==NULL ) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n" )); +if (psta ==NULL ) goto exit; - } psta->aid = passocsta_rsp->cam_id; psta->mac_id = passocsta_rsp->cam_id;
Signature · 1 line
2.20.1
PATCH v3 12/30 staging: rtl8723bs: fix null check conditions in core/rtw_cmd.c
In reply to Fabio Aiutofix post-commit hook checkpatch issues:
CHECK: Comparison to NULL could be written "!psta" 178: FILE: drivers/staging/rtl8723bs/core/rtw_cmd.c:2012:
+ if (psta == NULL)
CHECK: Comparison to NULL could be written "!psta" 198: FILE: drivers/staging/rtl8723bs/core/rtw_cmd.c:2066:
+ if (psta == NULL)
CHECK: Comparison to NULL could be written "!psta" 211: FILE: drivers/staging/rtl8723bs/core/rtw_cmd.c:2081:
+ if (psta == NULL)
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +3 -3
@@ -2009,7 +2009,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) psta =rtw_get_stainfo (&padapter->stapriv, pnetwork->MacAddress);if (!psta) { psta =rtw_alloc_stainfo (&padapter->stapriv, pnetwork->MacAddress); -if (psta ==NULL ) +if (!psta) goto createbss_cmd_fail; }
@@ -2063,7 +2063,7 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcstruct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *) (pcmd->rsp);struct sta_info *psta =rtw_get_stainfo (pstapriv, psetstakey_rsp->addr); -if (psta ==NULL ) +if (!psta) goto exit; exit:
@@ -2078,7 +2078,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *) (pcmd->rsp);struct sta_info *psta =rtw_get_stainfo (pstapriv, passocsta_parm->addr); -if (psta ==NULL ) +if (!psta) goto exit; psta->aid = passocsta_rsp->cam_id;
Signature · 1 line
2.20.1
PATCH v3 13/30 staging: rtl8723bs: remove unnecessary parentheses in if condition in core/rtw_cmd.c
In reply to Fabio Aiutofix post-commit hook checkpatch issue:
WARNING: Unnecessary parentheses
166: FILE: drivers/staging/rtl8723bs/core/rtw_cmd.c:2000:
+ if ((pcmd->res != H2C_SUCCESS))
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -1997,7 +1997,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)if (pcmd->parmbuf ==NULL ) goto exit; -if ((pcmd->res !=H2C_SUCCESS )) +if (pcmd->res !=H2C_SUCCESS )_set_timer (&pmlmepriv->assoc_timer,1 );del_timer_sync (&pmlmepriv->assoc_timer);
Signature · 1 line
2.20.1
PATCH v3 14/30 staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_mlme.c
In reply to Fabio AiutoRemove commented RT_TRACE calls in core/rtw_mlme.c
Remove all of the RT_TRACE logs in the core/rtw_mlme.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -6
@@ -356,7 +356,6 @@ static struct wlan_network *rtw_dequeue_network(struct __queue *queue)void rtw_free_network_nolock (struct adapter *padapter,struct wlan_network *pnetwork);void rtw_free_network_nolock (struct adapter *padapter,struct wlan_network *pnetwork) { -/* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_network ==> ssid = %s\n\n" , pnetwork->network.Ssid.Ssid)); */ _rtw_free_network_nolock (&(padapter->mlmepriv), pnetwork);rtw_cfg80211_unlink_bss (padapter, pnetwork); }
@@ -393,8 +392,6 @@ int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)inline int is_same_ess (struct wlan_bssid_ex *a,struct wlan_bssid_ex *b) { -/* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("(%s,%d)(%s,%d)\n", */ -/* a->Ssid.Ssid, a->Ssid.SsidLength, b->Ssid.Ssid, b->Ssid.SsidLength)); */ return (a->Ssid.SsidLength == b->Ssid.SsidLength) && !memcmp (a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength); }
@@ -551,8 +548,6 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex &(pmlmepriv->cur_network.network));if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) && (is_same_network (&(pmlmepriv->cur_network.network), pnetwork,0 ))) { -/* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,"Same Network\n"); */ -/* if (pmlmepriv->cur_network.network.IELength<= pnetwork->IELength) */ {update_network (&(pmlmepriv->cur_network.network), pnetwork, adapter, true);
@@ -778,7 +773,6 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)/* update IBSS_network 's timestamp */ if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) == true) { -/* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE\n\n"); */ if (!memcmp (&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress,ETH_ALEN )) {struct wlan_network *ibss_wlan =NULL ;
Signature · 1 line
2.20.1
PATCH v3 15/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_mlme.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_mlme.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 105 ++++------------------ 1 file changed, 15 insertions(+), 90 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +15 -90
@@ -155,8 +155,6 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)list_del_init (&pnetwork->list); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, - ("rtw_alloc_network: ptr =%p\n" , plist)); pnetwork->network_type =0 ; pnetwork->fixed = false; pnetwork->last_scanned = jiffies;
@@ -298,11 +296,11 @@ signed int rtw_if_up(struct adapter *padapter)signed int res;if (padapter->bDriverStopped || padapter->bSurpriseRemoved || - (check_fwstate (&padapter->mlmepriv, _FW_LINKED) == false)) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_if_up:bDriverStopped(%d) OR bSurpriseRemoved(%d)" , padapter->bDriverStopped, padapter->bSurpriseRemoved)); + (check_fwstate (&padapter->mlmepriv, _FW_LINKED) == false)) res = false; - }else +else res = true; +return res; }
@@ -339,7 +337,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n" ));_rtw_free_mlme_priv (pmlmepriv); }
@@ -607,10 +604,9 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t/* If there are no more slots, expire the oldest */ /* list_del_init(&oldest->list); */ pnetwork = oldest; -if (!pnetwork) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n\n\nsomething wrong here\n\n\n" )); +if (!pnetwork) goto exit; - } +memcpy (&(pnetwork->network), target,get_wlan_bssid_ex_sz (target));/* variable initialize */ pnetwork->fixed = false;
@@ -628,10 +624,8 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t pnetwork =rtw_alloc_network (pmlmepriv);/* will update scan_time */ -if (!pnetwork) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n\n\nsomething wrong here\n\n\n" )); +if (!pnetwork) goto exit; - } bssid_ex_sz =get_wlan_bssid_ex_sz (target); target->Length = bssid_ex_sz;
@@ -750,7 +744,6 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor/* TODO: Perry : For Power Management */ void rtw_atimdone_event_callback (struct adapter *adapter,u8 *pbuf) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("receive atimdone_event\n" )); }void rtw_survey_event_callback (struct adapter *adapter,u8 *pbuf)
@@ -761,13 +754,9 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) pnetwork = (struct wlan_bssid_ex *)pbuf; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_survey_event_callback, ssid =%s\n" , pnetwork->Ssid.Ssid)); - len =get_wlan_bssid_ex_sz (pnetwork); -if (len > (sizeof (struct wlan_bssid_ex ))) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n ****rtw_survey_event_callback: return a wrong bss ***\n" )); +if (len > (sizeof (struct wlan_bssid_ex )))return ; - }spin_lock_bh (&pmlmepriv->lock);
@@ -811,14 +800,9 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) pmlmepriv->wps_probe_req_ie =NULL ; } -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_surveydone_event_callback: fw_state:%x\n\n" ,get_fwstate (pmlmepriv))); -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) {del_timer_sync (&pmlmepriv->scan_to_timer);_clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); - }else { - -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("nic status =%x, survey done event comes too late!\n" ,get_fwstate (pmlmepriv))); }rtw_set_signal_stat_timer (&adapter->recvpriv);
@@ -837,8 +821,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */ _clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("switching to adhoc master\n" )); -memcpy (&pdev_network->Ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);
@@ -847,7 +829,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) pmlmepriv->fw_state =WIFI_ADHOC_MASTER_STATE ;if (rtw_createbss_cmd (adapter) != _SUCCESS) -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Error =>rtw_createbss_cmd status FAIL\n" )); + ; pmlmepriv->to_join = false; }
@@ -919,7 +901,6 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)struct __queue *scan_queue = &pmlmepriv->scanned_queue;struct list_head *plist, *phead, *ptemp; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n" ));spin_lock_bh (&scan_queue->lock);spin_lock_bh (&free_queue->lock);
@@ -956,8 +937,6 @@ static void find_network(struct adapter *adapter) pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);if (pwlan) pwlan->fixed = false; -else -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_assoc_resources : pwlan == NULL\n\n" ));if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) && (adapter->stapriv.asoc_sta_count ==1 ))
@@ -975,10 +954,6 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)struct dvobj_priv *psdpriv = adapter->dvobj;struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n" )); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress =%pM ssid =%s\n" , -MAC_ARG (tgt_network->network.MacAddress), tgt_network->network.Ssid.Ssid)); -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE |WIFI_AP_STATE )) {struct sta_info *psta;
@@ -1016,8 +991,6 @@ void rtw_indicate_connect(struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n" )); - pmlmepriv->to_join = false;if (!check_fwstate (&padapter->mlmepriv, _FW_LINKED)) {
@@ -1030,7 +1003,6 @@ void rtw_indicate_connect(struct adapter *padapter)rtw_set_to_roam (padapter,0 );rtw_set_scan_deny (padapter,3000 ); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv))); }/*
@@ -1040,8 +1012,6 @@ void rtw_indicate_disconnect(struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_disconnect\n" )); -_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS );/* DBG_871X("clear wps when %s\n", __func__); */
@@ -1207,9 +1177,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netstruct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct wlan_network *cur_network = &(pmlmepriv->cur_network); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:%pM\n" - ,get_fwstate (pmlmepriv),MAC_ARG (pnetwork->network.MacAddress))); -/* why not use ptarget_wlan?? */ memcpy (&cur_network->network, &pnetwork->network, pnetwork->network.Length);/* some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs */
@@ -1251,7 +1218,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netbreak ;default : pmlmepriv->fw_state =WIFI_NULL_STATE ; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Invalid network_mode\n" ));break ; }
@@ -1280,30 +1246,19 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ;unsigned int the_same_macaddr = false; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("joinbss event call back received with res =%d\n" , pnetwork->join_res)); -rtw_get_encrypt_decrypt_from_registrypriv (adapter); -if (pmlmepriv->assoc_ssid.SsidLength ==0 ) -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("@@@@@ joinbss event call back for Any SSid\n" )); -else -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("@@@@@ rtw_joinbss_event_callback for SSid:%s\n" , pmlmepriv->assoc_ssid.Ssid)); - the_same_macaddr = !memcmp (pnetwork->network.MacAddress, cur_network->network.MacAddress,ETH_ALEN ); pnetwork->network.Length =get_wlan_bssid_ex_sz (&pnetwork->network); -if (pnetwork->network.Length >sizeof (struct wlan_bssid_ex )) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n\n ***joinbss_evt_callback return a wrong bss ***\n\n" )); +if (pnetwork->network.Length >sizeof (struct wlan_bssid_ex ))return ; - }spin_lock_bh (&pmlmepriv->lock); pmlmepriv->LinkDetectInfo.TrafficTransitionCount =0 ; pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =0 ; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n rtw_joinbss_event_callback !! spin_lock_irqsave\n" )); -if (pnetwork->join_res >0 ) {spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); retry =0 ;
@@ -1349,7 +1304,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { ptarget_sta =rtw_joinbss_update_stainfo (adapter, pnetwork);if (!ptarget_sta) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Can't update stainfo when joinbss_event callback\n" ));spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); goto ignore_joinbss_callback; }
@@ -1359,18 +1313,12 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { pmlmepriv->cur_network_scanned = ptarget_wlan;rtw_indicate_connect (adapter); - }else { -/* adhoc mode will rtw_indicate_connect when rtw_stassoc_event_callback */ -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("adhoc mode, fw_state:%x" ,get_fwstate (pmlmepriv))); }/* s5. Cancel assoc_timer */ del_timer_sync (&pmlmepriv->assoc_timer); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("Cancel assoc_timer\n" )); - }else { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("rtw_joinbss_event_callback err: fw_state:%x" ,get_fwstate (pmlmepriv)));spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); goto ignore_joinbss_callback; }
@@ -1383,19 +1331,15 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)/* rtw_free_assoc_resources(adapter, 1); */ -if ((check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) == true) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("fail! clear _FW_UNDER_LINKING ^^^fw_state =%x\n" ,get_fwstate (pmlmepriv))); +if ((check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) == true)_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING); - } }else {/* if join_res < 0 (join fails), then try again */ #ifdef REJOIN res = _FAIL; -if (retry <2 ) { +if (retry <2 ) res =rtw_select_and_join_from_scanned_queue (pmlmepriv); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("rtw_select_and_join_from_scanned_queue again! res:%d\n" , res)); - }if (res == _SUCCESS) {/* extend time of assoc_timer */
@@ -1405,7 +1349,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING); rtw_indicate_connect(adapter); }else { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Set Assoc_Timer = 1; can't find match ssid in scanned_q\n" ));#endif _set_timer (&pmlmepriv->assoc_timer,1 );
@@ -1495,16 +1438,12 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)if (psta) {/* the sta have been in sta_info_queue => do nothing */ -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue\n" )); -return ;/* between drv has received this event before and fw have not yet to set key to CAM_ENTRY) */ } psta =rtw_alloc_stainfo (&adapter->stapriv, pstassoc->macaddr); -if (!psta) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Can't alloc sta_info when rtw_stassoc_event_callback\n" )); +if (!psta)return ; - }/* to do : init sta_info variable */ psta->qos_option =0 ;
@@ -1653,7 +1592,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) }if (rtw_createbss_cmd (adapter) != _SUCCESS) -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("***Error =>stadel_event_callback: rtw_createbss_cmd status FAIL***\n " )); + ; } }
@@ -1665,7 +1604,6 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf) {struct reportpwrstate_parm *preportpwrstate; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_cpwm_event_callback !!!\n" )); preportpwrstate = (struct reportpwrstate_parm *)pbuf; preportpwrstate->state |= (u8)(adapter_to_pwrctl (padapter)->cpwm_tog +0x80 );cpwm_int_hdl (padapter, preportpwrstate);
@@ -1931,7 +1869,6 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) pnetwork = container_of(mlme->pscanned, struct wlan_network, list);if (!pnetwork) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork == NULL)\n" , __func__)); ret = _FAIL; goto exit; }
@@ -2061,7 +1998,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);if (!pnetwork) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork == NULL)\n" , __func__)); ret = _FAIL; goto exit; }
@@ -2138,8 +2074,6 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurityINIT_LIST_HEAD (&pcmd->list); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("after enqueue set_auth_cmd, auth_mode =%x\n" , psecuritypriv->dot11AuthAlgrthm)); - res =rtw_enqueue_cmd (pcmdpriv, pcmd); exit:
@@ -2160,21 +2094,17 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp goto exit; } -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { +if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n rtw_set_key: psetkeyparm->algorithm =(unsigned char)psecuritypriv->dot118021XGrpPrivacy =%d\n" , psetkeyparm->algorithm)); - }else { +else psetkeyparm->algorithm = (u8 )psecuritypriv->dot11PrivacyAlgrthm; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n rtw_set_key: psetkeyparm->algorithm =(u8)psecuritypriv->dot11PrivacyAlgrthm =%d\n" , psetkeyparm->algorithm)); - } psetkeyparm->keyid = (u8 )keyid;/* 0~3 */ psetkeyparm->set_tx = set_tx;if (is_wep_enc (psetkeyparm->algorithm)) adapter->securitypriv.key_mask |=BIT (psetkeyparm->keyid);DBG_871X ("==> rtw_set_key algorithm(%x), keyid(%x), key_mask(%x)\n" , psetkeyparm->algorithm, psetkeyparm->keyid, adapter->securitypriv.key_mask); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n rtw_set_key: psetkeyparm->algorithm =%d psetkeyparm->keyid =(u8)keyid =%d\n" , psetkeyparm->algorithm, keyid));switch (psetkeyparm->algorithm) {
@@ -2197,7 +2127,6 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp psetkeyparm->grpkey =1 ;break ;default : -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n rtw_set_key:psecuritypriv->dot11PrivacyAlgrthm = %x (must be 1 or 2 or 4 or 5)\n" , psecuritypriv->dot11PrivacyAlgrthm)); res = _FAIL;kfree (psetkeyparm); goto exit;
@@ -2331,9 +2260,6 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, ustruct security_priv *psecuritypriv = &adapter->securitypriv;uint ndisauthmode = psecuritypriv->ndisauthtype; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, - ("+rtw_restruct_sec_ie: ndisauthmode =%d\n" , ndisauthmode)); -/* copy fixed ie only */ memcpy (out_ie, in_ie,12 ); ielength =12 ;
@@ -2430,7 +2356,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) } pdev_network->Configuration.DSConfig = (pregistrypriv->channel); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("pregistrypriv->channel =%d, pdev_network->Configuration.DSConfig = 0x%x\n" , pregistrypriv->channel, pdev_network->Configuration.DSConfig));if (cur_network->network.InfrastructureMode == Ndis802_11IBSS) pdev_network->Configuration.ATIMWindow = (0 );
Signature · 1 line
2.20.1
PATCH v3 16/30 staging: rtl8723bs: tidy up some error handling in core/rtw_mlme.c
In reply to Fabio Aiutothe RT_TRACE() output is not useful so we want to delete it. In this case there is no cleanup for rtw_cleanbss_cmd() required or even possible. I've deleted the RT_TRACE() output and added a goto unlock to show that we can't continue if rtw_createbss_cmd() fails.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +11 -6
@@ -815,6 +815,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)if (rtw_select_and_join_from_scanned_queue (pmlmepriv) == _SUCCESS) {_set_timer (&pmlmepriv->assoc_timer,MAX_JOIN_TIMEOUT ); }else { +u8 ret = _SUCCESS;struct wlan_bssid_ex *pdev_network = &(adapter->registrypriv.dev_network);u8 *pibss = adapter->registrypriv.dev_network.MacAddress;
@@ -828,10 +829,11 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) pmlmepriv->fw_state =WIFI_ADHOC_MASTER_STATE ; -if (rtw_createbss_cmd (adapter) != _SUCCESS) - ; - pmlmepriv->to_join = false; + + ret =rtw_createbss_cmd (adapter); +if (ret != _SUCCESS) + goto unlock; } } }else {
@@ -877,7 +879,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) }/* DBG_871X("scan complete in %dms\n", jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time)); */ - +unlock:spin_unlock_bh (&pmlmepriv->lock);rtw_os_xmit_schedule (adapter);
@@ -1564,6 +1566,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)rtw_free_stainfo (adapter, psta);if (adapter->stapriv.asoc_sta_count ==1 ) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ +u8 ret = _SUCCESS;/* rtw_indicate_disconnect(adapter);removed@20091105 */ spin_lock_bh (&(pmlmepriv->scanned_queue.lock));/* free old ibss network */
@@ -1591,12 +1594,14 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_STATE ); } -if (rtw_createbss_cmd (adapter) != _SUCCESS) - ; + ret =rtw_createbss_cmd (adapter); +if (ret != _SUCCESS) + goto unlock; } } +unlock:spin_unlock_bh (&pmlmepriv->lock); }
Signature · 1 line
2.20.1
Re: [PATCH v3 16/30] staging: rtl8723bs: tidy up some error handling in core/rtw_mlme.c
Quoted 10 lines · Fabio Aiuto
the
RT_TRACE()output is not useful so we want to delete it. In this case there is no cleanup forrtw_cleanbss_cmd()required or even possible. I've deleted theRT_TRACE()output and added a goto unlock to show that we can't continue ifrtw_createbss_cmd()fails.Suggested-by David Carpenter <[email protected]>Signed-off-by Fabio Aiuto <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
Hi Dan,
I put a Suggested-by tag on one patch in v3 patchset. But reading the docs on submitting patches I relaized later that maybe it requires your permission before.
It' written about Reviewed-by but not about Suggested-by, should I have asked you before, should I?
I'm sorry if I should have.
thank you,
fabio
Re: [PATCH v3 16/30] staging: rtl8723bs: tidy up some error handling in core/rtw_mlme.c
Quoted 12 lines · Fabio Aiuto
Quoted 10 lines · Fabio Aiuto
the
RT_TRACE()output is not useful so we want to delete it. In this case there is no cleanup forrtw_cleanbss_cmd()required or even possible. I've deleted theRT_TRACE()output and added a goto unlock to show that we can't continue ifrtw_createbss_cmd()fails.Suggested-by David Carpenter <[email protected]>Signed-off-by Fabio Aiuto <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
Quoted 8 lines
Hi Dan,
I put a Suggested-by tag on one patch in v3 patchset. But reading the docs on submitting patches I relaized later that maybe it requires your permission before.
It' written about Reviewed-by but not about Suggested-by, should I have asked you before, should I?
I'm sorry if I should have.
Found it, I'm really sorry
A Suggested-by: tag indicates that the patch idea is suggested by the person named and ensures credit to the person for the idea. Please note that this tag should not be added without the reporter's permission, especially if the idea was not posted in a public forum. That said, if we diligently credit our idea reporters, they will, hopefully, be inspired to help us again in the future.
I wonder if in the case of this patch was needed this tag..
Quoted 4 lines
thank you,
fabio
regards,
fabio
Re: [PATCH v3 16/30] staging: rtl8723bs: tidy up some error handling in core/rtw_mlme.c
Quoted 24 lines · Fabio Aiuto
Quoted 12 lines · Fabio Aiuto
Quoted 10 lines · Fabio Aiuto
the
RT_TRACE()output is not useful so we want to delete it. In this case there is no cleanup forrtw_cleanbss_cmd()required or even possible. I've deleted theRT_TRACE()output and added a goto unlock to show that we can't continue ifrtw_createbss_cmd()fails.Suggested-by David Carpenter <[email protected]>Signed-off-by Fabio Aiuto <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)Quoted 8 lines
Hi Dan,
I put a Suggested-by tag on one patch in v3 patchset. But reading the docs on submitting patches I relaized later that maybe it requires your permission before.
It' written about Reviewed-by but not about Suggested-by, should I have asked you before, should I?
I'm sorry if I should have.
Found it, I'm really sorry
Quoted 8 lines
A Suggested-by: tag indicates that the patch idea is suggested by the person named and ensures credit to the person for the idea. Please note that this tag should not be added without the reporter's permission, especially if the idea was not posted in a public forum. That said, if we diligently credit our idea reporters, they will, hopefully, be inspired to help us again in the future.
I wonder if in the case of this patch was needed this tag..
Yeah, it's fine. It's all on a public list so it's not a secret.
regards,
dan carpenter
PATCH v3 17/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_mlme_ext.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_mlme_ext.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 39 +++---------------- 1 file changed, 5 insertions(+), 34 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +5 -34
@@ -526,14 +526,8 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame)struct dvobj_priv *psdpriv = padapter->dvobj;struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, - ("+mgt_dispatcher: type(0x%x) subtype(0x%x)\n" , -GetFrameType (pframe),GetFrameSubType (pframe))); - -if (GetFrameType (pframe) !=WIFI_MGT_TYPE ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("mgt_dispatcher: type(0x%x) error!\n" ,GetFrameType (pframe))); +if (GetFrameType (pframe) !=WIFI_MGT_TYPE )return ; - }/* receive the frames that ra(a1) is my address or ra(a1) is bc address. */ if (memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) &&
@@ -545,10 +539,9 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame) index =GetFrameSubType (pframe) >>4 ; -if (index >=ARRAY_SIZE (mlme_sta_tbl)) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Currently we do not support reserved sub-fr-type =%d\n" , index)); +if (index >=ARRAY_SIZE (mlme_sta_tbl))return ; - } + ptable += index;if (psta) {
@@ -2675,8 +2668,6 @@ static int _issue_probereq(struct adapter *padapter,int bssrate_len =0 ;u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("+issue_probereq\n" )); - pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe) goto exit;
@@ -2743,8 +2734,6 @@ static int _issue_probereq(struct adapter *padapter, pattrib->last_txcmdsz = pattrib->pktlen; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("issuing probe_req, tx_len =%d\n" , pattrib->last_txcmdsz)); -if (wait_ack) { ret =dump_mgntframe_and_wait_ack (padapter, pmgntframe); }else {
@@ -4441,8 +4430,6 @@ void start_create_ibss(struct adapter *padapter)/* issue beacon */ if (send_beacon (padapter) == _FAIL) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("issuing beacon frame fail....\n" )); -report_join_res (padapter,-1 ); pmlmeinfo->state =WIFI_FW_NULL_STATE ; }else {
@@ -4622,8 +4609,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssidmemset (country,0 ,4 );memcpy (country, p,3 ); p +=3 ; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, - ("%s: 802.11d country =%s\n" , __func__, country)); i =0 ;while ((ie - p) >=3 ) {
@@ -4813,9 +4798,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssidbreak ; chplan_new[i].ScanType =SCAN_ACTIVE ; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, - ("%s: change channel %d scan type from passive to active\n" , - __func__, channel)); }break ; }
@@ -6332,10 +6314,6 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)#ifdef CHECK_EVENT_SEQ /* checking event sequence... */ if (evt_seq != (atomic_read (&pevt_priv->event_seq) &0x7f )) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, - ("Event Seq Error! %d vs %d\n" , (evt_seq &0x7f ), - (atomic_read (&pevt_priv->event_seq) &0x7f ))); - pevt_priv->event_seq = (evt_seq+1 )&0x7f ; goto _abort_event_;
@@ -6343,21 +6321,14 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)#endif /* checking if event code is valid */ -if (evt_code >=MAX_C2HEVT ) { -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\nEvent Code(%d) mismatch!\n" , evt_code)); +if (evt_code >=MAX_C2HEVT ) goto _abort_event_; - }/* checking if event size match the event parm size */ if ((wlanevents[evt_code].parmsize !=0 ) && - (wlanevents[evt_code].parmsize != evt_sz)) { - -RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("\nEvent(%d) Parm Size mismatch (%d vs %d)!\n" , - evt_code, wlanevents[evt_code].parmsize, evt_sz)); + (wlanevents[evt_code].parmsize != evt_sz)) goto _abort_event_; - } -atomic_inc (&pevt_priv->event_seq); peventbuf +=2 ;
Signature · 1 line
2.20.1
PATCH v3 18/30 staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_recv.c
In reply to Fabio AiutoRemove commented RT_TRACE calls
Remove all of the RT_TRACE logs in the core/rtw_recv.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -12
@@ -588,13 +588,11 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre prtnframe = precv_frame;/* check is the EAPOL frame or not (Rekey) */ /* if (ether_type == eapol_type) { */ -/* RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("########portctrl:ether_type == 0x888e\n")); */ /* check Rekey */ /* prtnframe =precv_frame; */ /* */ /* else { */ -/* RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:ether_type = 0x%04x\n", ether_type)); */ /* */ } }else
@@ -1693,7 +1691,6 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_frame retval =validate_recv_data_frame (adapter, precv_frame);if (retval == _FAIL) {struct recv_priv *precvpriv = &adapter->recvpriv; -/* RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail\n")); */ precvpriv->rx_drop++; }else if (retval == _SUCCESS) {#ifdef DBG_RX_DUMP_EAP
@@ -1889,7 +1886,6 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n/* Drop out the packet which SeqNum is smaller than WinStart */ if (SN_LESS (seq_num, preorder_ctrl->indicate_seq)) { -/* RT_TRACE(COMP_RX_REORDER, DBG_LOUD, ("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, NewSeqNum)); */ /* DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */ #ifdef DBG_RX_DROP_FRAME
@@ -1914,7 +1910,6 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n preorder_ctrl->indicate_seq, seq_num);#endif }else if (SN_LESS (wend, seq_num)) { -/* RT_TRACE(COMP_RX_REORDER, DBG_LOUD, ("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, NewSeqNum)); */ /* DbgPrint("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */ /* boundary situation, when seq_num cross 0xFFF */
@@ -1959,7 +1954,6 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, un plist =get_next (plist); else if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num)) /* Duplicate entry is found!! Do not insert current entry. */ - /* RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); */ /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */ return false; else
@@ -1980,8 +1974,6 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, un/* spin_unlock(&ppending_recvframe_queue->lock); */ /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */ - -/* RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Pkt insert into buffer!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); */ return true; }
@@ -2437,8 +2429,6 @@ s32 rtw_recv_entry(union recv_frame *precvframe)struct recv_priv *precvpriv;s32 ret = _SUCCESS; -/* RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("+rtw_recv_entry\n")); */ - padapter = precvframe->u.hdr.adapter; precvpriv = &padapter->recvpriv;
@@ -2456,8 +2446,6 @@ s32 rtw_recv_entry(union recv_frame *precvframe) _recv_entry_drop: -/* RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("_recv_entry_drop\n")); */ -return ret; }
Signature · 1 line
2.20.1
PATCH v3 19/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_recv.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_recv.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 134 +--------------------- 1 file changed, 6 insertions(+), 128 deletions(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +6 -128
@@ -325,10 +325,6 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p stainfo =rtw_get_stainfo (&adapter->stapriv, &prxattrib->ta[0 ]);if (prxattrib->encrypt == _TKIP_) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic:prxattrib->encrypt == _TKIP_\n" )); -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic:da = 0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n" , - prxattrib->ra[0 ], prxattrib->ra[1 ], prxattrib->ra[2 ], prxattrib->ra[3 ], prxattrib->ra[4 ], prxattrib->ra[5 ])); -/* calculate mic code */ if (stainfo) {if (IS_MCAST (prxattrib->ra)) {
@@ -337,28 +333,22 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p/* rxdata_key_idx =(((iv[3])>>6)&0x3) ; */ mickey = &psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0 ]; -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic: bcmc key\n" ));/* DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d), pmlmeinfo->key_index(%d) , recv key_id(%d)\n", */ /* psecuritypriv->dot118021XGrpKeyid, pmlmeinfo->key_index, rxdata_key_idx); */ if (psecuritypriv->binstallGrpkey == false) { res = _FAIL; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n" ));DBG_871X ("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n" ); goto exit; } }else { mickey = &stainfo->dot11tkiprxmickey.skey[0 ]; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic: unicast key\n" )); } datalen = precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8 ;/* icv_len included the mic code */ pframe = precvframe->u.hdr.rx_data; payload = pframe+prxattrib->hdrlen+prxattrib->iv_len; -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n prxattrib->iv_len =%d prxattrib->icv_len =%d\n" , prxattrib->iv_len, prxattrib->icv_len)); - -rtw_seccalctkipmic (mickey, pframe, payload, datalen, &miccode[0 ], (unsigned char )prxattrib->priority);/* care the length of the data */ pframemic = payload+datalen;
@@ -366,38 +356,12 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p bmic_err = false;for (i =0 ; i <8 ; i++) { -if (miccode[i] != *(pframemic+i)) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic:miccode[%d](%02x) != *(pframemic+%d)(%02x) " , i, miccode[i], i, *(pframemic+i))); +if (miccode[i] != *(pframemic+i)) bmic_err = true; - } }if (bmic_err == true) { - -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("\n *(pframemic-8)-*(pframemic-1) = 0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n" , - *(pframemic-8 ), *(pframemic-7 ), *(pframemic-6 ), *(pframemic-5 ), *(pframemic-4 ), *(pframemic-3 ), *(pframemic-2 ), *(pframemic-1 ))); -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("\n *(pframemic-16)-*(pframemic-9) = 0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n" , - *(pframemic-16 ), *(pframemic-15 ), *(pframemic-14 ), *(pframemic-13 ), *(pframemic-12 ), *(pframemic-11 ), *(pframemic-10 ), *(pframemic-9 ))); - - { -uint i; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("\n ======demp packet (len =%d) ======\n" , precvframe->u.hdr.len)); -for (i =0 ; i < precvframe->u.hdr.len; i = i+8 ) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x" , - *(precvframe->u.hdr.rx_data+i), *(precvframe->u.hdr.rx_data+i+1 ), - *(precvframe->u.hdr.rx_data+i+2 ), *(precvframe->u.hdr.rx_data+i+3 ), - *(precvframe->u.hdr.rx_data+i+4 ), *(precvframe->u.hdr.rx_data+i+5 ), - *(precvframe->u.hdr.rx_data+i+6 ), *(precvframe->u.hdr.rx_data+i+7 ))); - } -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("\n ======demp packet end [len =%d]======\n" , precvframe->u.hdr.len)); -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("\n hrdlen =%d,\n" , prxattrib->hdrlen)); - } - -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("ra = 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x psecuritypriv->binstallGrpkey =%d " , - prxattrib->ra[0 ], prxattrib->ra[1 ], prxattrib->ra[2 ], - prxattrib->ra[3 ], prxattrib->ra[4 ], prxattrib->ra[5 ], psecuritypriv->binstallGrpkey)); -/* double check key_index for some timing issue , */ /* cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue */ if ((IS_MCAST (prxattrib->ra) == true) && (prxattrib->key_index != pmlmeinfo->key_index))
@@ -405,10 +369,8 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *pif ((prxattrib->bdecrypted == true) && (brpt_micerror == true)) {rtw_handle_tkip_mic_err (adapter, (u8 )IS_MCAST (prxattrib->ra)); -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" mic error :prxattrib->bdecrypted =%d " , prxattrib->bdecrypted));DBG_871X (" mic error :prxattrib->bdecrypted =%d\n" , prxattrib->bdecrypted); }else { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" mic error :prxattrib->bdecrypted =%d " , prxattrib->bdecrypted));DBG_871X (" mic error :prxattrib->bdecrypted =%d\n" , prxattrib->bdecrypted); }
@@ -416,14 +378,10 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p }else {/* mic checked ok */ -if ((psecuritypriv->bcheck_grpkey == false) && (IS_MCAST (prxattrib->ra) == true)) { +if ((psecuritypriv->bcheck_grpkey == false) && (IS_MCAST (prxattrib->ra) == true)) psecuritypriv->bcheck_grpkey = true; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("psecuritypriv->bcheck_grpkey =true" )); - } } - - }else -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic: rtw_get_stainfo == NULL!!!\n" )); + }recvframe_pull_tail (precvframe,8 );
@@ -443,8 +401,6 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *punion recv_frame *return_packet = precv_frame;u32 res = _SUCCESS; -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("prxstat->decrypted =%x prxattrib->encrypt = 0x%03x\n" , prxattrib->bdecrypted, prxattrib->encrypt)); -if (prxattrib->encrypt >0 ) {u8 *iv = precv_frame->u.hdr.rx_data+prxattrib->hdrlen; prxattrib->key_index = (((iv[3 ])>>6 )&0x3 );
@@ -552,15 +508,12 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre psta =rtw_get_stainfo (pstapriv, psta_addr); -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:adapter->securitypriv.dot11AuthAlgrthm =%d\n" , adapter->securitypriv.dot11AuthAlgrthm)); -if (auth_alg ==2 ) {if ((psta) && (psta->ieee8021x_blocked)) {__be16 be_tmp;/* blocked */ /* only accept EAPOL frame */ -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:psta->ieee8021x_blocked == 1\n" )); prtnframe = precv_frame;
@@ -579,11 +532,6 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre }else {/* allowed */ /* check decryption status, and decrypt the frame if needed */ -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:psta->ieee8021x_blocked == 0\n" )); -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("portctrl:precv_frame->hdr.attrib.privacy =%x\n" , precv_frame->u.hdr.attrib.privacy)); - -if (pattrib->bdecrypted ==0 ) -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("portctrl:prxstat->decrypted =%x\n" , pattrib->bdecrypted)); prtnframe = precv_frame;/* check is the EAPOL frame or not (Rekey) */
@@ -608,18 +556,12 @@ static signed int recv_decache(union recv_frame *precv_frame, u8 bretry, structu16 seq_ctrl = ((precv_frame->u.hdr.attrib.seq_num&0xffff ) <<4 ) | (precv_frame->u.hdr.attrib.frag_num &0xf ); -if (tid >15 ) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, (tid>15)! seq_ctrl = 0x%x, tid = 0x%x\n" , seq_ctrl, tid)); - +if (tid >15 )return _FAIL; - }if (1 ) {/* if (bretry) */ -if (seq_ctrl == prxcache->tid_rxseq[tid]) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, seq_ctrl = 0x%x, tid = 0x%x, tid_rxseq = 0x%x\n" , seq_ctrl, tid, prxcache->tid_rxseq[tid])); - +if (seq_ctrl == prxcache->tid_rxseq[tid])return _FAIL; - } } prxcache->tid_rxseq[tid] = seq_ctrl;
@@ -766,7 +708,6 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame */* filter packets that SA is myself or multicast or broadcast */ if (!memcmp (myhwaddr, pattrib->src,ETH_ALEN )) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" SA ==myself\n" )); ret = _FAIL; goto exit; }
@@ -788,7 +729,6 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame * }else if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) {/* For Station mode, sa and bssid should always be BSSID, and DA is my mac-address */ if (memcmp (pattrib->bssid, pattrib->src,ETH_ALEN )) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("bssid != TA under STATION_MODE; drop pkt\n" )); ret = _FAIL; goto exit; }
@@ -830,7 +770,6 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame * *psta =rtw_get_stainfo (pstapriv, sta_addr);/* get ap_info */ if (!*psta) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under sta2sta_data_frame ; drop pkt\n" )); ret = _FAIL; goto exit; }
@@ -858,7 +797,6 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p/* filter packets that SA is myself or multicast or broadcast */ if (!memcmp (myhwaddr, pattrib->src,ETH_ALEN )) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" SA ==myself\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s SA =%pM, myhwaddr =%pM\n" , __func__,MAC_ARG (pattrib->src),MAC_ARG (myhwaddr));
@@ -869,8 +807,6 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p/* da should be for me */ if ((memcmp (myhwaddr, pattrib->dst,ETH_ALEN )) && (!bmcast)) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, - (" ap2sta_data_frame: compare DA fail; DA =%pM\n" ,MAC_ARG (pattrib->dst)));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s DA =%pM\n" , __func__,MAC_ARG (pattrib->dst));#endif
@@ -883,9 +819,6 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *pif (!memcmp (pattrib->bssid,"\x0\x0\x0\x0\x0\x0" ,ETH_ALEN ) || !memcmp (mybssid,"\x0\x0\x0\x0\x0\x0" ,ETH_ALEN ) || (memcmp (pattrib->bssid, mybssid,ETH_ALEN ))) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, - (" ap2sta_data_frame: compare BSSID fail ; BSSID =%pM\n" ,MAC_ARG (pattrib->bssid))); -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("mybssid =%pM\n" ,MAC_ARG (mybssid)));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s BSSID =%pM, mybssid =%pM\n" , __func__,MAC_ARG (pattrib->bssid),MAC_ARG (mybssid));
@@ -907,7 +840,6 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p *psta =rtw_get_stainfo (pstapriv, pattrib->bssid);/* get ap_info */ if (!*psta) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("ap2sta: can't get psta under STATION_MODE ; drop pkt\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n" , __func__);#endif
@@ -936,7 +868,6 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p *psta =rtw_get_stainfo (pstapriv, pattrib->bssid);/* get sta_info */ if (!*psta) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under MP_MODE ; drop pkt\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n" , __func__);#endif
@@ -998,7 +929,6 @@ static signed int sta2ap_data_frame(struct adapter *adapter, union recv_frame *p *psta =rtw_get_stainfo (pstapriv, pattrib->src);if (!*psta) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under AP_MODE; drop pkt\n" ));DBG_871X ("issue_deauth to sta =%pM for the reason(7)\n" ,MAC_ARG (pattrib->src));issue_deauth (adapter, pattrib->src,WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA );
@@ -1245,8 +1175,6 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter,/* free the defrag_q queue and return the prframe */ rtw_free_recvframe_queue (defrag_q, pfree_recv_queue); -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("Performance defrag!!!!!\n" )); -return prframe; }
@@ -1306,15 +1234,12 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union relist_add_tail (&pfhdr->list, phead);/* spin_unlock(&pdefrag_q->lock); */ -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("Enqueuq: ismfrag = %d, fragnum = %d\n" , ismfrag, fragnum)); - prtnframe =NULL ; }else {/* can't find this ta's defrag_queue, so free this recv_frame */ rtw_free_recvframe (precv_frame, pfree_recv_queue); prtnframe =NULL ; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n" , ismfrag, fragnum)); } }
@@ -1329,7 +1254,6 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union re/* spin_unlock(&pdefrag_q->lock); */ /* call recvframe_defrag to defrag */ -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("defrag: ismfrag = %d, fragnum = %d\n" , ismfrag, fragnum)); precv_frame =recvframe_defrag (padapter, pdefrag_q); prtnframe = precv_frame;
@@ -1337,7 +1261,6 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union re/* can't find this ta's defrag_queue, so free this recv_frame */ rtw_free_recvframe (precv_frame, pfree_recv_queue); prtnframe =NULL ; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n" , ismfrag, fragnum)); } }
@@ -1346,7 +1269,6 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union reif ((prtnframe) && (prtnframe->u.hdr.attrib.privacy)) {/* after defrag we must check tkip mic code */ if (recvframe_chkmic (padapter, prtnframe) == _FAIL) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic(padapter, prtnframe) == _FAIL\n" ));rtw_free_recvframe (prtnframe, pfree_recv_queue); prtnframe =NULL ; }
@@ -1358,13 +1280,9 @@ static signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_ {/* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */ -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("+validate_recv_mgnt_frame\n" )); - precv_frame =recvframe_chk_defrag (padapter, precv_frame); -if (!precv_frame) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, ("%s: fragment packet\n" , __func__)); +if (!precv_frame)return _SUCCESS; - } {/* for rx pkt statistics */
@@ -1444,7 +1362,6 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_fmemcpy (pattrib->ra,GetAddr1Ptr (ptr),ETH_ALEN );memcpy (pattrib->ta,GetAddr2Ptr (ptr),ETH_ALEN ); ret = _FAIL; -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" case 3\n" ));break ;default :
@@ -1464,7 +1381,6 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_fif (!psta) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" after to_fr_ds_chk; psta == NULL\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s psta == NULL\n" , __func__);#endif
@@ -1502,7 +1418,6 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_f/* decache, drop duplicate recv packets */ if (recv_decache (precv_frame, bretry, &psta->sta_recvpriv.rxcache) == _FAIL) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("decache : drop pkt\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s recv_decache return _FAIL\n" , __func__);#endif
@@ -1511,14 +1426,8 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_f }if (pattrib->privacy) { - -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("validate_recv_data_frame:pattrib->privacy =%x\n" , pattrib->privacy)); -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n ^^^^^^^^^^^IS_MCAST(pattrib->ra(0x%02x)) =%d^^^^^^^^^^^^^^^6\n" , pattrib->ra[0 ],IS_MCAST (pattrib->ra))); -GET_ENCRY_ALGO (psecuritypriv, psta, pattrib->encrypt,IS_MCAST (pattrib->ra)); -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n pattrib->encrypt =%d\n" , pattrib->encrypt)); -SET_ICE_IV_LEN (pattrib->iv_len, pattrib->icv_len, pattrib->encrypt); }else { pattrib->encrypt =0 ;
@@ -1642,7 +1551,6 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_frame/* add version chk */ if (ver !=0 ) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail! (ver!= 0)\n" )); retval = _FAIL; goto exit; }
@@ -1676,14 +1584,10 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_frame } retval =validate_recv_mgnt_frame (adapter, precv_frame); -if (retval == _FAIL) -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_mgnt_frame fail\n" )); retval = _FAIL;/* only data frame return _SUCCESS */ break ;case WIFI_CTRL_TYPE :/* ctrl */ retval =validate_recv_ctrl_frame (adapter, precv_frame); -if (retval == _FAIL) -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_ctrl_frame fail\n" )); retval = _FAIL;/* only data frame return _SUCCESS */ break ;case WIFI_DATA_TYPE :/* data */
@@ -1708,7 +1612,6 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_frame }break ;default : -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail! type = 0x%x\n" , type));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type = 0x%x\n" , type);#endif
@@ -1755,8 +1658,6 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe) rmv_len = pattrib->hdrlen + pattrib->iv_len + (bsnaphdr?SNAP_SIZE :0 ); len = precvframe->u.hdr.len - rmv_len; -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n ===pattrib->hdrlen: %x, pattrib->iv_len:%x ===\n\n" , pattrib->hdrlen, pattrib->iv_len)); -memcpy (&be_tmp, ptr+rmv_len,2 ); eth_type =ntohs (be_tmp);/* pattrib->ether_type */ pattrib->eth_type = eth_type;
@@ -2036,10 +1937,6 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor pattrib = &prframe->u.hdr.attrib;if (!SN_LESS (preorder_ctrl->indicate_seq, pattrib->seq_num)) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, - ("recv_indicatepkts_in_order: indicate =%d seq =%d amsdu =%d\n" , - preorder_ctrl->indicate_seq, pattrib->seq_num, pattrib->amsdu)); - plist =get_next (plist);list_del_init (&(prframe->u.hdr.list));
@@ -2110,8 +2007,6 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *if (pattrib->qos !=1 ) {if ((padapter->bDriverStopped == false) && (padapter->bSurpriseRemoved == false)) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ recv_indicatepkt_reorder -recv_func recv_indicatepkt\n" )); -rtw_recv_indicatepkt (padapter, prframe);return _SUCCESS;
@@ -2171,10 +2066,6 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *spin_lock_bh (&ppending_recvframe_queue->lock); -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, - ("recv_indicatepkt_reorder: indicate =%d seq =%d\n" , - preorder_ctrl->indicate_seq, pattrib->seq_num)); -/* s2. check if winstart_b(indicate_seq) needs to been updated */ if (!check_indicate_seq (preorder_ctrl, pattrib->seq_num)) { pdbgpriv->dbg_rx_ampdu_drop_count++;
@@ -2272,7 +2163,6 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame }else {/* B/G mode */ retval =wlanhdr_to_ethhdr (prframe);if (retval != _SUCCESS) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("wlanhdr_to_ethhdr: drop pkt\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n" , __func__);#endif
@@ -2281,14 +2171,8 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frameif ((padapter->bDriverStopped == false) && (padapter->bSurpriseRemoved == false)) {/* indicate this recv_frame */ -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func recv_indicatepkt\n" ));rtw_recv_indicatepkt (padapter, prframe); - - }else { -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func free_indicatepkt\n" )); - -RT_TRACE (_module_rtl871x_recv_c_, _drv_notice_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)" , padapter->bDriverStopped, padapter->bSurpriseRemoved)); retval = _FAIL;return retval; }
@@ -2307,7 +2191,6 @@ static int recv_func_prehandle(struct adapter *padapter, union recv_frame *rfram/* check the frame crtl field and decache */ ret =validate_recv_frame (padapter, rframe);if (ret != _SUCCESS) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("recv_func: validate_recv_frame fail! drop pkt\n" ));rtw_free_recvframe (rframe, pfree_recv_queue);/* free this recv_frame */ goto exit; }
@@ -2325,7 +2208,6 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr prframe =decryptor (padapter, prframe);if (!prframe) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("decryptor: drop pkt\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n" , __func__);#endif
@@ -2335,7 +2217,6 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr prframe =recvframe_chk_defrag (padapter, prframe);if (!prframe) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chk_defrag: drop pkt\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n" , __func__);#endif
@@ -2344,7 +2225,6 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr prframe =portctrl (padapter, prframe);if (!prframe) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("portctrl: drop pkt\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n" , __func__);#endif
@@ -2356,7 +2236,6 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr ret =process_recv_indicatepkts (padapter, prframe);if (ret != _SUCCESS) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("recv_func: process_recv_indicatepkts fail!\n" ));#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n" , __func__);#endif
@@ -2435,7 +2314,6 @@ s32 rtw_recv_entry(union recv_frame *precvframe) ret =recv_func (padapter, precvframe);if (ret == _FAIL) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("rtw_recv_entry: recv_func return fail!!!\n" )); goto _recv_entry_drop; }
Signature · 1 line
2.20.1
PATCH v3 20/30 staging: rtl8723bs: added spaces around operator in core/rtw_recv.c
In reply to Fabio Aiutofix post-commit hook checkpatch issue:
CHECK: spaces preferred around that '+' (ctx:VxV) 60: FILE: drivers/staging/rtl8723bs/core/rtw_recv.c:359:
+ if (miccode[i] != *(pframemic+i))
^
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -356,7 +356,7 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p bmic_err = false;for (i =0 ; i <8 ; i++) { -if (miccode[i] != *(pframemic+i)) +if (miccode[i] != *(pframemic + i)) bmic_err = true; }
Signature · 1 line
2.20.1
PATCH v3 21/30 staging: rtl8723bs: split long line in core/rtw_recv.c
In reply to Fabio Aiutofix post-commit hook checkpatch issue:
WARNING: line length of 113 exceeds 100 columns 110: FILE: drivers/staging/rtl8723bs/core/rtw_recv.c:381:
+ if ((psecuritypriv->bcheck_grpkey
== false) && (IS_MCAST(prxattrib->ra) == true))
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +2 -1
@@ -378,7 +378,8 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p }else {/* mic checked ok */ -if ((psecuritypriv->bcheck_grpkey == false) && (IS_MCAST (prxattrib->ra) == true)) +if ((psecuritypriv->bcheck_grpkey == false) && + (IS_MCAST (prxattrib->ra) == true)) psecuritypriv->bcheck_grpkey = true; } }
Signature · 1 line
2.20.1
PATCH v3 22/30 staging: rtl8723bs: remove unnecessary parentheses in core/rtw_recv.c
In reply to Fabio Aiutofix post-commit checkpatch issue:
CHECK: Unnecessary parentheses around 'psecuritypriv->bcheck_grpkey == false'
24: FILE: drivers/staging/rtl8723bs/core/rtw_recv.c:381:
+ if ((psecuritypriv->
bcheck_grpkey == false) && + (IS_MCAST(prxattrib->ra) == true))
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -378,7 +378,7 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p }else {/* mic checked ok */ -if ((psecuritypriv->bcheck_grpkey == false) && +if (psecuritypriv->bcheck_grpkey == false && (IS_MCAST (prxattrib->ra) == true)) psecuritypriv->bcheck_grpkey = true; }
Signature · 1 line
2.20.1
PATCH v3 23/30 staging: rtl8723bs: fix comparison in if condition in core/rtw_recv.c
In reply to Fabio Aiutofix post-commit checkpatch issue:
CHECK: Using comparison to false is error prone 27: FILE: drivers/staging/rtl8723bs/core/rtw_recv.c:381:
+ if (psecuritypriv->
bcheck_grpkey == false &&
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -378,7 +378,7 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p }else {/* mic checked ok */ -if (psecuritypriv->bcheck_grpkey == false && +if (!psecuritypriv->bcheck_grpkey && (IS_MCAST (prxattrib->ra) == true)) psecuritypriv->bcheck_grpkey = true; }
Signature · 1 line
2.20.1
Re: [PATCH v3 23/30] staging: rtl8723bs: fix comparison in if condition in core/rtw_recv.c
Quoted 26 lines · Fabio Aiuto
fix post-commit checkpatch issue:
CHECK: Using comparison to false is error prone 27: FILE:
drivers/staging/rtl8723bs/core/rtw_recv.c:381:(quoted diff) +1
-0+ if (psecuritypriv->bcheck_grpkey == false &&Signed-off-by Fabio Aiuto <[email protected]>---
drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/rtl8723bs/core/rtw_recv.c +0
-0@@ -378,7 +378,7 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p} else {
/* mic checked ok */drivers/staging/rtl8723bs/core/rtw_recv.c +1
-1- if (psecuritypriv->bcheck_grpkey == false && + if (!psecuritypriv->bcheck_grpkey &&(
IS_MCAST(prxattrib->ra)== true))psecuritypriv->bcheck_grpkey= true; }
PATCH v3 24/30 staging: rtl8723bs: remove commented RT_TRACE call in core/rtw_ioctl_set.c
In reply to Fabio AiutoRemove commented RT_TRACE call in core/rtw_ioctl_set.c
Remove all of the RT_TRACE logs in the core/rtw_ioctl_set.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +0 -3
@@ -451,9 +451,6 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,/* SecClearAllKeys(adapter); */ -/* RT_TRACE(COMP_OID_SET, DBG_LOUD, ("set_infrastructure: fw_state:%x after changing mode\n", */ -/* get_fwstate(pmlmepriv))); */ -spin_unlock_bh (&pmlmepriv->lock); }return true;
Signature · 1 line
2.20.1
PATCH v3 25/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_ioctl_set.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_ioctl_set.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 76 +------------------ 1 file changed, 4 insertions(+), 72 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +4 -72
@@ -28,7 +28,6 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)u8 ret = true;if (ssid->SsidLength >32 ) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n" )); ret = false; goto exit; }
@@ -49,8 +48,6 @@ u8 rtw_do_join(struct adapter *padapter) phead =get_list_head (queue); plist =get_next (phead); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("\n rtw_do_join: phead = %p; plist = %p\n\n\n" , phead, plist)); - pmlmepriv->cur_network.join_res =-2 ;set_fwstate (pmlmepriv, _FW_UNDER_LINKING);
@@ -69,13 +66,11 @@ u8 rtw_do_join(struct adapter *padapter)if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false ||rtw_to_roam (padapter) >0 ) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("rtw_do_join(): site survey if scanned_queue is empty\n." ));/* submit site_survey_cmd */ ret =rtw_sitesurvey_cmd (padapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 ); -if (_SUCCESS != ret) { +if (_SUCCESS != ret) pmlmepriv->to_join = false; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_do_join(): site survey return error\n." )); - } + }else { pmlmepriv->to_join = false; ret = _FAIL;
@@ -107,15 +102,12 @@ u8 rtw_do_join(struct adapter *padapter)rtw_generate_random_ibss (pibss);if (rtw_createbss_cmd (padapter) != _SUCCESS) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("***Error =>do_goin: rtw_createbss_cmd status FAIL***\n " )); ret = false; goto exit; } pmlmepriv->to_join = false; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("***Error => rtw_select_and_join_from_scanned_queue FAIL under STA_Mode***\n " )); - }else {/* can't associate ; reset under-linking */ _clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING);
@@ -127,10 +119,9 @@ u8 rtw_do_join(struct adapter *padapter) ) {/* DBG_871X("rtw_do_join() when no desired bss in scanning queue\n"); */ ret =rtw_sitesurvey_cmd (padapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 ); -if (_SUCCESS != ret) { +if (_SUCCESS != ret) pmlmepriv->to_join = false; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("do_join(): site survey return error\n." )); - } + } else { ret = _FAIL; pmlmepriv->to_join = false;
@@ -169,16 +160,10 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid) goto release_mlme_lock;if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE ) == true) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n" )); -if (!memcmp (&pmlmepriv->cur_network.network.MacAddress, bssid,ETH_ALEN )) {if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false) goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */ }else { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("Set BSSID not the same bssid\n" )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid =%pM\n" ,MAC_ARG (bssid))); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("cur_bssid =%pM\n" ,MAC_ARG (pmlmepriv->cur_network.network.MacAddress))); -rtw_disassoc_cmd (padapter,0 , true);if (check_fwstate (pmlmepriv, _FW_LINKED) == true)
@@ -212,8 +197,6 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)spin_unlock_bh (&pmlmepriv->lock); exit: -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("rtw_set_802_11_bssid: status =%d\n" , status));return status; }
@@ -229,8 +212,6 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) ssid->Ssid, get_fwstate(pmlmepriv));if (padapter->hw_init_completed == false) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("set_ssid: hw_init_completed ==false =>exit!!!\n" )); status = _FAIL; goto exit; }
@@ -244,16 +225,9 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) goto release_mlme_lock;if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE ) == true) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, - ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n" )); -if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) && (!memcmp (&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength))) {if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false)) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("Set SSID is the same ssid, fw_state = 0x%08x\n" , -get_fwstate (pmlmepriv))); -if (rtw_is_same_ibss (padapter, pnetwork) == false) {/* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */ rtw_disassoc_cmd (padapter,0 , true);
@@ -274,10 +248,6 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_JOINBSS ,1 ); } }else { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("Set SSID not the same ssid\n" )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_ssid =[%s] len = 0x%x\n" , ssid->Ssid, (unsigned int )ssid->SsidLength)); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("assoc_ssid =[%s] len = 0x%x\n" , pmlmepriv->assoc_ssid.Ssid, (unsigned int )pmlmepriv->assoc_ssid.SsidLength)); -rtw_disassoc_cmd (padapter,0 , true);if (check_fwstate (pmlmepriv, _FW_LINKED) == true)
@@ -315,8 +285,6 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)spin_unlock_bh (&pmlmepriv->lock); exit: -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("-rtw_set_802_11_ssid: status =%d\n" , status));return status; }
@@ -342,8 +310,6 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis_802_1 }if (padapter->hw_init_completed == false) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("set_ssid: hw_init_completed ==false =>exit!!!\n" )); status = _FAIL; goto exit; }
@@ -395,12 +361,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,struct wlan_network *cur_network = &pmlmepriv->cur_network;enum ndis_802_11_network_infrastructure *pold_state = &(cur_network->network.InfrastructureMode); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_notice_, - ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n" , - *pold_state, networktype,get_fwstate (pmlmepriv))); -if (*pold_state != networktype) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, (" change mode!" ));/* DBG_871X("change mode, old_mode =%d, new_mode =%d, fw_state = 0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv)); */ if (*pold_state == Ndis802_11APMode) {
@@ -464,8 +425,6 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)spin_lock_bh (&pmlmepriv->lock);if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_disassociate: rtw_indicate_disconnect\n" )); -rtw_disassoc_cmd (padapter,0 , true);rtw_indicate_disconnect (padapter);/* modify for CONFIG_IEEE80211W, none 11w can use it */
@@ -484,28 +443,20 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_sstruct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 res = true; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("+rtw_set_802_11_bssid_list_scan(), fw_state =%x\n" ,get_fwstate (pmlmepriv))); -if (padapter ==NULL ) { res = false; goto exit; }if (padapter->hw_init_completed == false) { res = false; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n ===rtw_set_802_11_bssid_list_scan:hw_init_completed ==false ===\n" )); goto exit; }if ((check_fwstate (pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) || (pmlmepriv->LinkDetectInfo.bBusyTraffic == true)) {/* Scan or linking is in progress, do nothing. */ -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_set_802_11_bssid_list_scan fail since fw_state = %x\n" ,get_fwstate (pmlmepriv))); res = true; -if (check_fwstate (pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING)) == true) -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n" )); -else -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n###pmlmepriv->sitesurveyctrl.traffic_busy ==true\n\n" )); }else {if (rtw_is_scan_deny (padapter)) {DBG_871X (FUNC_ADPT_FMT ": scan deny\n" ,FUNC_ADPT_ARG (padapter));
@@ -530,12 +481,8 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11int res;u8 ret; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_802_11_auth.mode(): mode =%x\n" , authmode)); - psecuritypriv->ndisauthtype = authmode; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("rtw_set_802_11_authentication_mode:psecuritypriv->ndisauthtype =%d" , psecuritypriv->ndisauthtype)); -if (psecuritypriv->ndisauthtype >3 ) psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
@@ -559,7 +506,6 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep) keyid = wep->KeyIndex &0x3fffffff ;if (keyid >=4 ) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("MgntActrtw_set_802_11_add_wep:keyid>4 =>fail\n" )); ret = false; goto exit; }
@@ -567,35 +513,21 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)switch (wep->KeyLength) {case 5 : psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_add_wep:wep->KeyLength =5\n" ));break ;case 13 : psecuritypriv->dot11PrivacyAlgrthm = _WEP104_; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_add_wep:wep->KeyLength = 13\n" ));break ;default : psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_add_wep:wep->KeyLength!=5 or 13\n" ));break ; } -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, - ("rtw_set_802_11_add_wep:before memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x keyid =%x\n" , - wep->KeyLength, wep->KeyIndex, keyid)); -memcpy (&(psecuritypriv->dot11DefKey[keyid].skey[0 ]), &(wep->KeyMaterial), wep->KeyLength); psecuritypriv->dot11DefKeylen[keyid] = wep->KeyLength; psecuritypriv->dot11PrivacyKeyIndex = keyid; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x\n" , - psecuritypriv->dot11DefKey[keyid].skey[0 ], psecuritypriv->dot11DefKey[keyid].skey[1 ], psecuritypriv->dot11DefKey[keyid].skey[2 ], - psecuritypriv->dot11DefKey[keyid].skey[3 ], psecuritypriv->dot11DefKey[keyid].skey[4 ], psecuritypriv->dot11DefKey[keyid].skey[5 ], - psecuritypriv->dot11DefKey[keyid].skey[6 ], psecuritypriv->dot11DefKey[keyid].skey[7 ], psecuritypriv->dot11DefKey[keyid].skey[8 ], - psecuritypriv->dot11DefKey[keyid].skey[9 ], psecuritypriv->dot11DefKey[keyid].skey[10 ], psecuritypriv->dot11DefKey[keyid].skey[11 ], - psecuritypriv->dot11DefKey[keyid].skey[12 ])); - res =rtw_set_key (padapter, psecuritypriv, keyid,1 , true);if (res == _FAIL)
Signature · 1 line
2.20.1
PATCH v3 26/30 staging: rtl8723bs: place constant on the right side of the test in core/rtw_ioctl_set.c
In reply to Fabio Aiutofix posst-commit hook checkpatch issues:
WARNING: Comparisons should place the constant on the right side of the test
40: FILE: drivers/staging/rtl8723bs/core/rtw_ioctl_set.c:71:
+ if (_SUCCESS != ret)
WARNING: Comparisons should place the constant on the right side of the test
69: FILE: drivers/staging/rtl8723bs/core/rtw_ioctl_set.c:122:
+ if (_SUCCESS != ret)
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +2 -2
@@ -68,7 +68,7 @@ u8 rtw_do_join(struct adapter *padapter) ) { /* submit site_survey_cmd */ ret = rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0); - if (_SUCCESS != ret) + if (ret != _SUCCESS) pmlmepriv->to_join = false; } else {
@@ -119,7 +119,7 @@ u8 rtw_do_join(struct adapter *padapter) ) {/* DBG_871X("rtw_do_join() when no desired bss in scanning queue\n"); */ ret =rtw_sitesurvey_cmd (padapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 ); -if (_SUCCESS != ret) +if (ret != _SUCCESS) pmlmepriv->to_join = false; } else {
Signature · 1 line
2.20.1
PATCH v3 27/30 staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_wlan_util.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_wlan_util.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +4 -20
@@ -1334,11 +1334,6 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)memcpy (bssid->Ssid.Ssid, (p +2 ), ssid_len); bssid->Ssid.SsidLength = ssid_len; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("%s bssid.Ssid.Ssid:%s bssid.Ssid.SsidLength:%d " -"cur_network->network.Ssid.Ssid:%s len:%d\n" , __func__, bssid->Ssid.Ssid, - bssid->Ssid.SsidLength, cur_network->network.Ssid.Ssid, - cur_network->network.Ssid.SsidLength)); -if (memcmp (bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid,32 ) || bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) {if (bssid->Ssid.Ssid[0 ] !='\0' && bssid->Ssid.SsidLength !=0 ) {/* not hidden ssid */
@@ -1355,9 +1350,6 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)else bssid->Privacy =0 ; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, - ("%s(): cur_network->network.Privacy is %d, bssid.Privacy is %d\n" , - __func__, cur_network->network.Privacy, bssid->Privacy));if (cur_network->network.Privacy != bssid->Privacy) {DBG_871X ("%s(), privacy is not match\n" , __func__); goto _mismatch;
@@ -1382,25 +1374,17 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)if (encryp_protocol ==ENCRYP_PROTOCOL_WPA || encryp_protocol ==ENCRYP_PROTOCOL_WPA2 ) { pbuf =rtw_get_wpa_ie (&bssid->IEs[12 ], &wpa_ielen, bssid->IELength-12 );if (pbuf && (wpa_ielen >0 )) { -if (_SUCCESS ==rtw_parse_wpa_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is_8021x)) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, - ("%s pnetwork->pairwise_cipher: %d, group_cipher is %d, is_8021x is %d\n" , __func__, - pairwise_cipher, group_cipher, is_8021x)); - } +rtw_parse_wpa_ie (pbuf, wpa_ielen +2 , &group_cipher, + &pairwise_cipher, &is_8021x); }else { pbuf =rtw_get_wpa2_ie (&bssid->IEs[12 ], &wpa_ielen, bssid->IELength-12 );if (pbuf && (wpa_ielen >0 )) { -if (_SUCCESS ==rtw_parse_wpa2_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is_8021x)) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, - ("%s pnetwork->pairwise_cipher: %d, pnetwork->group_cipher is %d, is_802x is %d\n" , - __func__, pairwise_cipher, group_cipher, is_8021x)); - } +rtw_parse_wpa2_ie (pbuf, wpa_ielen +2 , &group_cipher, + &pairwise_cipher, &is_8021x); } } -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, - ("%s cur_network->group_cipher is %d: %d\n" , __func__, cur_network->BcnInfo.group_cipher, group_cipher));if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || group_cipher != cur_network->BcnInfo.group_cipher) { DBG_871X("%s pairwise_cipher(%x:%x) or group_cipher(%x:%x) is not match\n", __func__, pairwise_cipher, cur_network->BcnInfo.pairwise_cipher,
Signature · 1 line
2.20.1
PATCH v3 28/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_sta_mgt.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_sta_mgt.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 25 -------------------- 1 file changed, 25 deletions(-)
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +0 -25
@@ -216,10 +216,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) index =wifi_mac_hash (hwaddr); -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, ("rtw_alloc_stainfo: index = %x" , index)); -if (index >=NUM_STA ) { -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("ERROR => rtw_alloc_stainfo: index >= NUM_STA" ));spin_unlock_bh (&(pstapriv->sta_hash_lock)); psta =NULL ; goto exit;
@@ -242,17 +239,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)for (i =0 ; i <16 ; i++)memcpy (&psta->sta_recvpriv.rxcache.tid_rxseq[i], &wRxSeqInitialValue,2 ); -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, - ("alloc number_%d stainfo with hwaddr = %x %x %x %x %x %x \n" , - pstapriv->asoc_sta_count, - hwaddr[0 ], - hwaddr[1 ], - hwaddr[2 ], - hwaddr[3 ], - hwaddr[4 ], - hwaddr[5 ]) - ); -init_addba_retry_timer (pstapriv->padapter, psta);/* for A-MPDU Rx reordering buffer control */
@@ -363,16 +349,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)spin_unlock_bh (&pxmitpriv->lock);list_del_init (&psta->hash_list); -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, - ("\n free number_%d stainfo with hwaddr = 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x \n" , - pstapriv->asoc_sta_count, - psta->hwaddr[0 ], - psta->hwaddr[1 ], - psta->hwaddr[2 ], - psta->hwaddr[3 ], - psta->hwaddr[4 ], - psta->hwaddr[5 ]) - ); pstapriv->asoc_sta_count--;/* re-init sta_info; 20061114 will be init in alloc_stainfo */
@@ -543,7 +519,6 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter)if (!psta) { res = _FAIL; -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("rtw_alloc_stainfo fail" )); goto exit; }
Signature · 1 line
2.20.1
PATCH v3 29/30 staging: rtl8723bs: remove RT_TRACE logs in core/rtw_ieee80211.c
In reply to Fabio AiutoRemove all of the RT_TRACE logs in the core/rtw_ieee80211.c file as they currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged. Moreover it relies on an unneeded private log level tracing which overrides the in-kernel public one, so just remove them as they are unused.
--- .../staging/rtl8723bs/core/rtw_ieee80211.c | 90 ++++--------------- 1 file changed, 15 insertions(+), 75 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +15 -75
@@ -488,11 +488,8 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis pos +=WPA_SELECTOR_LEN ; left -=WPA_SELECTOR_LEN ; - }else if (left >0 ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie length mismatch, %u too much" , __func__, left)); - + }else if (left >0 )return _FAIL; - }/* pairwise_cipher */ if (left >=2 ) {
@@ -501,11 +498,8 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis pos +=2 ; left -=2 ; -if (count ==0 || left < count *WPA_SELECTOR_LEN ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie count botch (pairwise), " -"count %u left %u" , __func__, count, left)); +if (count ==0 || left < count *WPA_SELECTOR_LEN )return _FAIL; - }for (i =0 ; i < count; i++) { *pairwise_cipher |=rtw_get_wpa_cipher_suite (pos);
@@ -514,16 +508,13 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis left -=WPA_SELECTOR_LEN ; } - }else if (left ==1 ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie too short (for key mgmt)" , __func__)); + }else if (left ==1 )return _FAIL; - }if (is_8021x) {if (left >=6 ) { pos +=2 ;if (!memcmp (pos,SUITE_1X ,4 )) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("%s : there has 802.1x auth\n" , __func__)); *is_8021x =1 ; } }
@@ -559,10 +550,8 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi pos +=RSN_SELECTOR_LEN ; left -=RSN_SELECTOR_LEN ; - }else if (left >0 ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie length mismatch, %u too much" , __func__, left)); + }else if (left >0 )return _FAIL; - }/* pairwise_cipher */ if (left >=2 ) {
@@ -571,11 +560,8 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi pos +=2 ; left -=2 ; -if (count ==0 || left < count *RSN_SELECTOR_LEN ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie count botch (pairwise), " -"count %u left %u" , __func__, count, left)); +if (count ==0 || left < count *RSN_SELECTOR_LEN )return _FAIL; - }for (i =0 ; i < count; i++) { *pairwise_cipher |=rtw_get_wpa2_cipher_suite (pos);
@@ -584,19 +570,14 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi left -=RSN_SELECTOR_LEN ; } - }else if (left ==1 ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie too short (for key mgmt)" , __func__)); - + }else if (left ==1 )return _FAIL; - }if (is_8021x) {if (left >=6 ) { pos +=2 ; -if (!memcmp (pos,SUITE_1X ,4 )) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("%s (): there has 802.1x auth\n" , __func__)); +if (!memcmp (pos,SUITE_1X ,4 )) *is_8021x =1 ; - } } }
@@ -607,7 +588,7 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwiint rtw_get_wapi_ie (u8 *in_ie,uint in_len,u8 *wapi_ie,u16 *wapi_len) {int len =0 ; -u8 authmode, i; +u8 authmode;uint cnt;u8 wapi_oui1[4 ] = {0x0 ,0x14 ,0x72 ,0x01 };u8 wapi_oui2[4 ] = {0x0 ,0x14 ,0x72 ,0x02 };
@@ -626,16 +607,9 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)/* if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY) */ if (authmode ==WLAN_EID_BSS_AC_ACCESS_DELAY && (!memcmp (&in_ie[cnt+6 ], wapi_oui1,4 ) || !memcmp (&in_ie[cnt+6 ], wapi_oui2,4 ))) { -if (wapi_ie) { +if (wapi_ie)memcpy (wapi_ie, &in_ie[cnt], in_ie[cnt+1 ]+2 ); -for (i =0 ; i < (in_ie[cnt+1 ]+2 ); i = i+8 ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n" , - wapi_ie[i], wapi_ie[i+1 ], wapi_ie[i+2 ], wapi_ie[i+3 ], wapi_ie[i+4 ], - wapi_ie[i+5 ], wapi_ie[i+6 ], wapi_ie[i+7 ])); - } - } -if (wapi_len) *wapi_len = in_ie[cnt+1 ]+2 ;
@@ -654,7 +628,7 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)void rtw_get_sec_ie (u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16 *wpa_len) { -u8 authmode, sec_idx, i; +u8 authmode, sec_idx;u8 wpa_oui[4 ] = {0x0 ,0x50 ,0xf2 ,0x01 };uint cnt;
@@ -668,33 +642,15 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie authmode = in_ie[cnt];if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt+2 ], &wpa_oui[0 ],4 ))) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n rtw_get_wpa_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n" , sec_idx, in_ie[cnt+1 ]+2 )); - -if (wpa_ie) { +if (wpa_ie)memcpy (wpa_ie, &in_ie[cnt], in_ie[cnt+1 ]+2 ); -for (i =0 ; i < (in_ie[cnt+1 ]+2 ); i = i+8 ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n" , - wpa_ie[i], wpa_ie[i+1 ], wpa_ie[i+2 ], wpa_ie[i+3 ], wpa_ie[i+4 ], - wpa_ie[i+5 ], wpa_ie[i+6 ], wpa_ie[i+7 ])); - } - } - - *wpa_len = in_ie[cnt+1 ]+2 ; - cnt += in_ie[cnt+1 ]+2 ;/* get next */ + *wpa_len = in_ie[cnt+1 ]+2 ; + cnt += in_ie[cnt+1 ]+2 ;/* get next */ }else {if (authmode ==WLAN_EID_RSN ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n get_rsn_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n" , sec_idx, in_ie[cnt+1 ]+2 )); - -if (rsn_ie) { -memcpy (rsn_ie, &in_ie[cnt], in_ie[cnt+1 ]+2 ); - -for (i =0 ; i < (in_ie[cnt+1 ]+2 ); i = i+8 ) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n" , - rsn_ie[i], rsn_ie[i+1 ], rsn_ie[i+2 ], rsn_ie[i+3 ], rsn_ie[i+4 ], - rsn_ie[i+5 ], rsn_ie[i+6 ], rsn_ie[i+7 ])); - } - } +if (rsn_ie) +memcpy (rsn_ie, &in_ie[cnt], in_ie[cnt +1 ] +2 ); *rsn_len = in_ie[cnt+1 ]+2 ; cnt += in_ie[cnt+1 ]+2 ;/* get next */
@@ -1138,28 +1094,20 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) pbuf =rtw_get_wpa_ie (&pnetwork->network.IEs[12 ], &wpa_ielen, pnetwork->network.IELength-12 );if (pbuf && (wpa_ielen >0 )) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_cipher_info: wpa_ielen: %d" , wpa_ielen));if (_SUCCESS ==rtw_parse_wpa_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is8021x)) { pnetwork->BcnInfo.pairwise_cipher = pairwise_cipher; pnetwork->BcnInfo.group_cipher = group_cipher; pnetwork->BcnInfo.is_8021x = is8021x; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("%s: pnetwork->pairwise_cipher: %d, is_8021x is %d" , - __func__, pnetwork->BcnInfo.pairwise_cipher, pnetwork->BcnInfo.is_8021x)); ret = _SUCCESS; } }else { pbuf =rtw_get_wpa2_ie (&pnetwork->network.IEs[12 ], &wpa_ielen, pnetwork->network.IELength-12 );if (pbuf && (wpa_ielen >0 )) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("get RSN IE\n" ));if (_SUCCESS ==rtw_parse_wpa2_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is8021x)) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("get RSN IE OK!!!\n" )); pnetwork->BcnInfo.pairwise_cipher = pairwise_cipher; pnetwork->BcnInfo.group_cipher = group_cipher; pnetwork->BcnInfo.is_8021x = is8021x; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("%s: pnetwork->pairwise_cipher: %d," -"pnetwork->group_cipher is %d, is_8021x is %d" , __func__, pnetwork->BcnInfo.pairwise_cipher, - pnetwork->BcnInfo.group_cipher, pnetwork->BcnInfo.is_8021x)); ret = _SUCCESS; } }
@@ -1189,10 +1137,6 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) pnetwork->BcnInfo.encryp_protocol =ENCRYP_PROTOCOL_OPENSYS ; }rtw_get_sec_ie (pnetwork->network.IEs, pnetwork->network.IELength,NULL , &rsn_len,NULL , &wpa_len); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: ssid =%s\n" , pnetwork->network.Ssid.Ssid)); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: wpa_len =%d rsn_len =%d\n" , wpa_len, rsn_len)); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: ssid =%s\n" , pnetwork->network.Ssid.Ssid)); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: wpa_len =%d rsn_len =%d\n" , wpa_len, rsn_len));if (rsn_len >0 ) { pnetwork->BcnInfo.encryp_protocol =ENCRYP_PROTOCOL_WPA2 ;
@@ -1202,10 +1146,6 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)if (bencrypt) pnetwork->BcnInfo.encryp_protocol =ENCRYP_PROTOCOL_WEP ; } -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: pnetwork->encryp_protocol is %x\n" , - pnetwork->BcnInfo.encryp_protocol)); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: pnetwork->encryp_protocol is %x\n" , - pnetwork->BcnInfo.encryp_protocol));rtw_get_cipher_info (pnetwork);/* get bwmode and ch_offset */
Signature · 1 line
2.20.1
PATCH v3 30/30 staging: rtl8723bs: add spaces around operators in core/rtw_ieee80211.c
In reply to Fabio Aiutofix post-commit hook checkpatch issues:
CHECK: spaces preferred around that '+' (ctx:VxV) 161: FILE: drivers/staging/rtl8723bs/core/rtw_ieee80211.c:648:
+ *wpa_len = in_ie[cnt+1]+2;
^
CHECK: spaces preferred around that '+' (ctx:VxV) 161: FILE: drivers/staging/rtl8723bs/core/rtw_ieee80211.c:648:
+ *wpa_len = in_ie[cnt+1]+2;
^
CHECK: spaces preferred around that '+' (ctx:VxV) 162: FILE: drivers/staging/rtl8723bs/core/rtw_ieee80211.c:649:
+ cnt += in_ie[cnt+1]+2; /* get next */
^
CHECK: spaces preferred around that '+' (ctx:VxV) 162: FILE: drivers/staging/rtl8723bs/core/rtw_ieee80211.c:649:
+ cnt += in_ie[cnt+1]+2; /* get next */
^
--- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +2 -2
@@ -645,8 +645,8 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ieif (wpa_ie)memcpy (wpa_ie, &in_ie[cnt], in_ie[cnt+1 ]+2 ); - *wpa_len = in_ie[cnt+1 ]+2 ; - cnt += in_ie[cnt+1 ]+2 ;/* get next */ + *wpa_len = in_ie[cnt +1 ] +2 ; + cnt += in_ie[cnt +1 ] +2 ;/* get next */ }else {if (authmode ==WLAN_EID_RSN ) {if (rsn_ie)
Signature · 1 line
2.20.1
Quoted 1 line · Fabio Aiuto
This patchset removes all
RT_TRACEusages in core/ files.
and hal and include and os_dep
Quoted 7 lines
This is the first of a series aimed at removing
RT_TRACEmacro.The whole private tracing system is not tied to a configuration symbol and the default behaviour is
_tracenothing_. It's verbose and relies on a private log level tracing doomed to be removed.
It's nice, but individual patches per file done by hand are difficult to review because you are interleaving removal patches with cleanup patches.
I believe this should be a patch series with a single patch to remove all RT_TRACE macro uses using coccinelle and then use separate patches to do whatever cleanups around these removals you want to do.
All of these below should be done for all files in drivers/staging/rtl8723bs at once instead of submitting per-file patches.
IMO something like:
Cover-letter: Explain why you are doing this
Patch 1 of N: Remove all RT_TRACE macro uses using a coccinelle script
and include the coccinelle script in the commit message
Patch 2 of N: Remove commented out RT_TRACE uses
Patch 3 of N: Remove RT_TRACE macro definition
Patch 4 of N: Cleanup coccinelle generated {} uses, if/else braces and
the now unnecessary if tests around the RT_TRACE removals
Patch 5 of N: Cleanup whitespace
Patcn x of N: Whatever else related to these RT_TRACE sites...
https://lore.kernel.org/lkml/[email protected]/
Using a sequence like the above would be much easier to review and would be a significant shorter patch set.
Quoted 4 lines · Joe Perches
Quoted 1 line · Fabio Aiuto
This patchset removes all
RT_TRACEusages in core/ files.and hal and include and
os_dep
Hi,
I was just about to send the second patchset relative to hal/ files. The whole has been split up in directories in order to reduce the number of patch per patchset
Quoted 9 lines
Quoted 8 lines
This is the first of a series aimed at removing
RT_TRACEmacro.The whole private tracing system is not tied to a configuration symbol and the default behaviour is
_tracenothing_. It's verbose and relies on a private log level tracing doomed to be removed.
Quoted 7 lines
It's nice, but individual patches per file done by hand are difficult to review because you are interleaving removal patches with cleanup patches.
I believe this should be a patch series with a single patch to remove all
RT_TRACEmacro uses using coccinelle and then use separate patches to do whatever cleanups around these removals you want to do.
It's a good idea, but the patches relative to RT_TRACE removal could be huge
Quoted 16 lines
All of these below should be done for all files in
drivers/staging/rtl8723bsat once instead of submitting per-file patches.IMO something like:
Cover-letter: Explain why you are doing this
Patch 1 of N: Remove allRT_TRACEmacro uses using a coccinelle script
and include the coccinelle script in the commit message
Patch 2 of N: Remove commented outRT_TRACEuses
Patch 3 of N: RemoveRT_TRACEmacro definition
Patch 4 of N: Cleanup coccinelle generated {} uses, if/else braces and
the now unnecessary if tests around theRT_TRACEremovals
Patch 5 of N: Cleanup whitespace
Patcn x of N: Whatever else related to theseRT_TRACEsites...
Quoted 5 lines
https://lore.kernel.org/lkml/[email protected]/
Using a sequence like the above would be much easier to review and would be a significant shorter patch set.
moreover every non RT_TRACE deletion patch (clean up patch) is near to the contextual deletion patch (parent patch or grand-parent)
but I do not have experience in code reviewing, so I will do like you say. Maybe I wait for other opinions, but what you say is good and elegant.
thank you,
fabio
Quoted 6 lines · Fabio Aiuto
Quoted 4 lines · Joe Perches
Quoted 1 line · Fabio Aiuto
This patchset removes all
RT_TRACEusages in core/ files.and hal and include and
os_dep
Quoted 8 lines
Hi,
I was just about to send the second patchset relative to hal/ files. The whole has been split up in directories in order to reduce the number of patch per patchset
It's a good idea, but the patches relative to
RT_TRACEremoval could be huge
That's really not a significant issue.
Simplicity in review is also important. Mechanization of patch creation can reduce review efforts.
Few people are actively working on this particular codebase. As far as I can tell no logical defect is being corrected here. None of this is likely to be backported.
Applying each individual patch has a 'cost' in maintainer time and review effort.
Fewer patches create lower overall costs.
Good luck...
Quoted 13 lines · Joe Perches
Quoted 11 lines · Fabio Aiuto
Quoted 4 lines · Joe Perches
Quoted 1 line · Fabio Aiuto
This patchset removes all
RT_TRACEusages in core/ files.and hal and include and
os_depHi,
I was just about to send the second patchset relative to hal/ files. The whole has been split up in directories in order to reduce the number of patch per patchset
Quoted 6 lines
Quoted 2 lines
It's a good idea, but the patches relative to
RT_TRACEremoval could be hugeThat's really not a significant issue.
Simplicity in review is also important. Mechanization of patch creation can reduce review efforts.
Maybe I wrongly associated simplicity with patch dimensions, but maybe for patches this simple have expert reviewers some tool for automatic review?
Is automatic review possible?
Quoted 7 lines
Few people are actively working on this particular codebase. As far as I can tell no logical defect is being corrected here. None of this is likely to be backported.
Applying each individual patch has a 'cost' in maintainer time and review effort.
got it
Quoted 5 lines
Fewer patches create lower overall costs.
Good luck...
I like your idea, and sure I will work in that direction, for this particular case I wait maintainer's opinion. If patchsets will be rejected again I will apply the scheme you proposed, if it will be accepted I will apply the scheme for next patchsets.
Thank you,
fabio
Quoted 17 lines · Fabio Aiuto
Quoted 16 lines · Joe Perches
Quoted 14 lines · Fabio Aiuto
Quoted 4 lines · Joe Perches
Quoted 1 line · Fabio Aiuto
This patchset removes all
RT_TRACEusages in core/ files.and hal and include and
os_depHi,
I was just about to send the second patchset relative to hal/ files. The whole has been split up in directories in order to reduce the number of patch per patchset
It's a good idea, but the patches relative to
RT_TRACEremoval could be huge
Quoted 7 lines
Quoted 3 lines
That's really not a significant issue.
Simplicity in review is also important. Mechanization of patch creation can reduce review efforts.Maybe I wrongly associated simplicity with patch dimensions, but maybe for patches this simple have expert reviewers some tool for automatic review?
Coccinelle is a relatively trusted tool and using it as a scripting mechanism where the script is shown as part of the commit message gives confidence that the change it produces can be applied without significant doubt.
To improve confidence that any change that does not have an output object code delta, comparing the object code produced before and after the change is useful. Showing that the code has been both compiled and compared in the commit message also improves confidence that the change is useful and can be applied.
Quoted 31 lines · Joe Perches
Quoted 17 lines · Fabio Aiuto
Quoted 16 lines · Joe Perches
Quoted 14 lines · Fabio Aiuto
Quoted 4 lines · Joe Perches
Quoted 1 line · Fabio Aiuto
This patchset removes all
RT_TRACEusages in core/ files.and hal and include and
os_depHi,
I was just about to send the second patchset relative to hal/ files. The whole has been split up in directories in order to reduce the number of patch per patchset
It's a good idea, but the patches relative to
RT_TRACEremoval could be hugeQuoted 7 lines
Quoted 3 lines
That's really not a significant issue.
Simplicity in review is also important. Mechanization of patch creation can reduce review efforts.Maybe I wrongly associated simplicity with patch dimensions, but maybe for patches this simple have expert reviewers some tool for automatic review?
Coccinelle is a relatively trusted tool and using it as a scripting mechanism where the script is shown as part of the commit message gives confidence that the change it produces can be applied without significant doubt.
Quoted 7 lines
To improve confidence that any change that does not have an output object code delta, comparing the object code produced before and after the change is useful. Showing that the code has been both compiled and compared in the commit message also improves confidence that the change is useful and can be applied.
which tool provides an object code delta output suitable for a commit message?
I dare a proposal apologizing in advance if this question should sound off topic, if it is please tell me how to ask it,
is anyone of you all available being my mentor?
I realized that what you told me in last weeks helps me a lot, and maybe a mentor can address me working towards more useful code bases.
I choosed rtl8723bs quite by random, just to make experience in cleaning up code, and get more confident with required dev tools, but if there is some other task with higher priority that I could carry on, I will be glad to
follow directives of a mentor. I really would like to become an expert kernel developer, and the way community works gets me more and more involved.
Thank you again to all people helping me,
fabio