Commit 2965d4b4 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

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



Remove RT_TRACE macro calls from core/rtw_mlme.c, so that ultimately the
macro definition itself can eventually be removed. Also remove the (now) empty
functions rtw_atimdone_event_callback and rtw_cpwm_event_callback, as
well as their declarations and struct inclusions in the relevant header
files.

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


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

drivers/staging/r8188eu/core/rtw_mlme.c

+12 −118
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f 


	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;
@@ -299,14 +298,10 @@ int rtw_if_up(struct adapter *padapter) 
	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;

}
@@ -358,10 +353,7 @@ int rtw_init_mlme_priv (struct adapter *padapter)/* struct mlme_priv *pmlmepriv) 


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



}



static struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)
@@ -577,10 +569,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;
@@ -688,12 +678,6 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network * 
	return bselected;

}



/* 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_evet\n"));

}



void rtw_survey_event_callback(struct adapter	*adapter, u8 *pbuf)

{

	u32 len;
@@ -702,13 +686,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);



	/*  update IBSS_network 's timestamp */
@@ -753,14 +733,10 @@ 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)) {

		timer_cancelled = 1;



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

	}



	spin_unlock_bh(&pmlmepriv->lock);
@@ -784,8 +760,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) 


					_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);



					RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("switching to adhoc master\n"));



					memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));

					memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));
@@ -794,8 +768,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"));

					rtw_createbss_cmd(adapter);

					pmlmepriv->to_join = false;

				}

			}
@@ -853,7 +826,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);
@@ -882,11 +854,6 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) 
	struct	sta_priv *pstapriv = &adapter->stapriv;

	struct wlan_network *tgt_network = &pmlmepriv->cur_network;



	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",

		 tgt_network->network.MacAddress, tgt_network->network.Ssid.Ssid));



	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_AP_STATE)) {

		struct sta_info *psta;
@@ -916,8 +883,6 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) 
	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)))

		rtw_free_network_nolock(pmlmepriv, pwlan);
@@ -935,8 +900,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)) {
@@ -950,9 +913,6 @@ void rtw_indicate_connect(struct adapter *padapter) 
	pmlmepriv->to_roaming = 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)));



}



/*
@@ -962,8 +922,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);



	if (pmlmepriv->to_roaming > 0)
@@ -1085,10 +1043,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net 


	DBG_88E("%s\n", __func__);



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("\nfw_state:%x, BSSID:%pM\n",

		 get_fwstate(pmlmepriv), 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 */
@@ -1117,7 +1071,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net 
		break;

	default:

		pmlmepriv->fw_state = WIFI_NULL_STATE;

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Invalid network_mode\n"));

		break;

	}
@@ -1145,27 +1098,16 @@ 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);



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\nrtw_joinbss_event_callback!! spin_lock_init\n"));



	if (pnetwork->join_res > 0) {

		spin_lock_bh(&pmlmepriv->scanned_queue.lock);

		if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {
@@ -1203,7 +1145,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 
			if (ptarget_wlan) {

				rtw_joinbss_update_network(adapter, ptarget_wlan, pnetwork);

			} else {

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Can't find ptarget_wlan when joinbss_event callback\n"));

				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

				goto ignore_joinbss_callback;

			}
@@ -1212,7 +1153,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;

				}
@@ -1222,18 +1162,11 @@ 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. Cancle assoc_timer */

			_cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled);



			RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("Cancle 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;

		}
@@ -1244,10 +1177,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 
		rtw_reset_securitypriv(adapter);

		_set_timer(&pmlmepriv->assoc_timer, 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 */

		_set_timer(&pmlmepriv->assoc_timer, 1);

		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
@@ -1335,16 +1266,12 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) 
#endif

	/* for AD-HOC mode */

	psta = rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr);

	if (psta) {

	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;

	psta->mac_id = (uint)pstassoc->cam_id;
@@ -1466,21 +1393,13 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) 
				_clr_fwstate_(pmlmepriv, WIFI_ADHOC_STATE);

			}



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

			rtw_createbss_cmd(adapter);

		}

	}

	spin_unlock_bh(&pmlmepriv->lock);



}



void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)

{



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_cpwm_event_callback !!!\n"));



}



/*

* _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss

* @adapter: pointer to struct adapter structure
@@ -1679,7 +1598,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) 
	while (phead != pmlmepriv->pscanned) {

		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;

		}
@@ -1750,9 +1668,6 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv) 
	pcmd->rsp = NULL;

	pcmd->rspsz = 0;

	INIT_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:
@@ -1782,25 +1697,15 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in 


	memset(psetkeyparm, 0, sizeof(struct setkey_parm));



	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;

	pmlmepriv->key_mask |= BIT(psetkeyparm->keyid);

	DBG_88E("==> rtw_set_key algorithm(%x), keyid(%x), key_mask(%x)\n",

		psetkeyparm->algorithm, psetkeyparm->keyid, pmlmepriv->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) {

	case _WEP40_:
@@ -1822,9 +1727,6 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in 
		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;

		goto exit;

	}
@@ -1938,11 +1840,6 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ 
	struct mlme_priv *pmlmepriv = &adapter->mlmepriv;

	struct security_priv *psecuritypriv = &adapter->securitypriv;

	uint	ndisauthmode = psecuritypriv->ndisauthtype;

	uint ndissecuritytype = psecuritypriv->ndisencryptstatus;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,

		 ("+rtw_restruct_sec_ie: ndisauthmode=%d ndissecuritytype=%d\n",

		  ndisauthmode, ndissecuritytype));



	/* copy fixed ie only */

	memcpy(out_ie, in_ie, 12);
@@ -2035,9 +1932,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);

drivers/staging/r8188eu/include/rtw_mlme.h

+0 −2
Original line number Diff line number Diff line
@@ -453,8 +453,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf); 
void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf);

void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf);

void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf);

void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf);

void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf);

void indicate_wx_scan_complete_event(struct adapter *padapter);

void rtw_indicate_wx_assoc_event(struct adapter *padapter);

void rtw_indicate_wx_disassoc_event(struct adapter *padapter);

drivers/staging/r8188eu/include/rtw_mlme_ext.h

+2 −2
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ static struct fwevent wlanevents[] = { 
	{0, &rtw_joinbss_event_callback},		/*10*/

	{sizeof(struct stassoc_event), &rtw_stassoc_event_callback},

	{sizeof(struct stadel_event), &rtw_stadel_event_callback},

	{0, &rtw_atimdone_event_callback},

	{0, NULL},

	{0, rtw_dummy_event_callback},

	{0, NULL},	/*15*/

	{0, NULL},
@@ -849,7 +849,7 @@ static struct fwevent wlanevents[] = { 
	{0, NULL},	 /*20*/

	{0, NULL},

	{0, NULL},

	{0, &rtw_cpwm_event_callback},

	{0, NULL},

	{0, NULL},

};