Commit 9bb2e9b1 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove RT_TRACE calls from core/rtw_xmit.c 



Remove RT_TRACE macro calls from core/rtw_xmit.c, so that ultimately the
macro definition itself can eventually be removed.

Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210806004034.82233-9-phil@philpotter.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5833ca54

drivers/staging/r8188eu/core/rtw_xmit.c

+4 −79
Original line number Diff line number Diff line
@@ -76,7 +76,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;

	}
@@ -113,7 +112,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
	pxmitpriv->pallocated_xmitbuf = rtw_zvmalloc(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) 
	pxmitpriv->pallocated_xmit_extbuf = rtw_zvmalloc(num_xmit_extbuf * 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;

	}
@@ -467,7 +464,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"));

					/*  Use low rate to send DHCP packet. */

					pattrib->dhcp_pkt = 1;

				}
@@ -492,7 +488,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 => drrp the pkt */

			RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra: %pM\n", (pattrib->ra)));

			res = _FAIL;

			goto exit;

		} else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) && (!(psta->state & _FW_LINKED))) {
@@ -507,7 +502,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p 
		pattrib->psta = psta;

	} else {

		/*  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", (pattrib->ra)));

		res = _FAIL;

		goto exit;

	}
@@ -533,12 +527,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p 
	}



	if (psta->ieee8021x_blocked) {

		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)) {

			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true,  pattrib->ether_type(%.4x) != 0x888e\n", pattrib->ether_type));

			res = _FAIL;

			goto exit;

		}
@@ -574,15 +565,11 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p 
		pattrib->icv_len = 4;



		if (padapter->securitypriv.busetkipkey == _FAIL) {

			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,

				 ("\npadapter->securitypriv.busetkipkey(%d) == _FAIL drop packet\n",

				 padapter->securitypriv.busetkipkey));

			res = _FAIL;

			goto exit;

		}

		break;

	case _AES_:

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("pattrib->encrypt=%d (_AES_)\n", pattrib->encrypt));

		pattrib->iv_len = 8;

		pattrib->icv_len = 8;

		break;
@@ -592,20 +579,11 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p 
		break;

	}



	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 || !psecuritypriv->hw_decrypted)) {

	    (padapter->securitypriv.sw_encrypt || !psecuritypriv->hw_decrypted))

		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"));

	}



	rtw_set_tx_chksum_offload(pkt, pattrib);
@@ -682,17 +660,8 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr 


			for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {

				payload = (u8 *)RND4((size_t)(payload));

				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);
@@ -701,31 +670,15 @@ 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)));

			} else {

				RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: rtw_get_stainfo==NULL!!!\n"));

		}

	}
@@ -737,7 +690,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi 
	struct	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_:
@@ -752,8 +704,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi 
		default:

			break;

		}

	} else {

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n"));

	}



	return _SUCCESS;
@@ -818,7 +768,6 @@ s32 rtw_make_wlanhdr (struct adapter *padapter, u8 *hdr, struct pkt_attrib *patt 
			if (psta->qos_option)

				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;

		}
@@ -989,7 +938,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_88E("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n");

		res = _FAIL;

		goto exit;
@@ -1038,10 +986,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct 


			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;
@@ -1082,8 +1026,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct 
			ClearMFrag(mem_start);



			break;

		} else {

			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__));

		}



		addr = (size_t)(pframe);
@@ -1093,7 +1035,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_88E("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n");

		res = _FAIL;

		goto exit;
@@ -1347,7 +1288,6 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf 
	spin_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);
@@ -1362,8 +1302,6 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf 
	if (pxframe) { /* default value setting */

		pxmitpriv->free_xmitframe_cnt--;



		RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe():free_xmitframe_cnt=%d\n", pxmitpriv->free_xmitframe_cnt));



		pxframe->buf_addr = NULL;

		pxframe->pxmitbuf = NULL;
@@ -1390,10 +1328,8 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram 
	struct 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;

	}



	spin_lock_bh(&pfree_xmit_queue->lock);
@@ -1407,7 +1343,6 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram 
	list_add_tail(&pxmitframe->list, get_list_head(pfree_xmit_queue));



	pxmitpriv->free_xmitframe_cnt++;

	RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, ("rtw_free_xmitframe():free_xmitframe_cnt=%d\n", pxmitpriv->free_xmitframe_cnt));



	spin_unlock_bh(&pfree_xmit_queue->lock);
@@ -1443,8 +1378,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram 
s32 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"));

/* 		pxmitframe->pkt = NULL; */

		return _FAIL;

	}
@@ -1534,26 +1467,22 @@ 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:

	case 3:

	default:

		ptxservq = &(psta->sta_xmitpriv.be_q);

		*(ac) = 2;

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : BE\n"));

	break;

	}
@@ -1583,7 +1512,6 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe) 
	if (!psta) {

		res = _FAIL;

		DBG_88E("rtw_xmit_classifier: psta == NULL\n");

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("rtw_xmit_classifier: psta == NULL\n"));

		goto exit;

	}
@@ -1807,7 +1735,6 @@ static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib 
	u8 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;

}
@@ -1830,7 +1757,6 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt) 


	pxmitframe = rtw_alloc_xmitframe(pxmitpriv);

	if (!pxmitframe) {

		RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: no more pxmitframe\n"));

		DBG_88E("DBG_TX_DROP_FRAME %s no more pxmitframe\n", __func__);

		return -1;

	}
@@ -1850,7 +1776,6 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt) 
	res = update_attrib(padapter, *ppkt, &pxmitframe->attrib);



	if (res == _FAIL) {

		RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n"));

		rtw_free_xmitframe(pxmitpriv, pxmitframe);

		return -1;

	}