Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90403aa1 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Update RT_TRACE macro and uses 



Create an rt_trace function using %pV to reduce overall code size.
Update the macro uses to remove unnecessary and now harmful parentheses.

Miscellanea around these changes:

o Coalesce formats
o Realign arguments
o Remove commented-out RT_TRACE uses
o Spelling fixes in formats
o Add missing newlines to formats
o Remove multiple newlines from formats
o Neaten formats where noticed
o Use %pM in one instance

Reduces code size ~20KB

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73454eaf

drivers/staging/rtl8723au/core/rtw_cmd.c

+23 −32
Original line number Diff line number Diff line
@@ -299,9 +299,8 @@ static void rtw_cmd_work(struct work_struct *work) 
		pcmd_callback =	rtw_cmd_callback[pcmd->cmdcode].callback;

		if (!pcmd_callback) {

			RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,

				 ("mlme_cmd_hdl(): pcmd_callback = 0x%p, "

				  "cmdcode = 0x%x\n",

				  pcmd_callback, pcmd->cmdcode));

				 "mlme_cmd_hdl(): pcmd_callback = 0x%p, cmdcode = 0x%x\n",

				 pcmd_callback, pcmd->cmdcode);

			rtw_free_cmd_obj23a(pcmd);

		} else {

			/* need consider that free cmd_obj in
@@ -310,8 +309,8 @@ static void rtw_cmd_work(struct work_struct *work) 
		}

	} else {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("%s: cmdcode = 0x%x callback not defined!\n",

			  __func__, pcmd->cmdcode));

			 "%s: cmdcode = 0x%x callback not defined!\n",

			 __func__, pcmd->cmdcode);

		rtw_free_cmd_obj23a(pcmd);

	}

}
@@ -343,7 +342,7 @@ int rtw_sitesurvey_cmd23a(struct rtw_adapter *padapter, 
	rtw_free_network_queue23a(padapter);



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,

		 ("%s: flush network queue\n", __func__));

		 "%s: flush network queue\n", __func__);



	init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara,

				   GEN_CMD_CODE(_SiteSurvey));
@@ -412,12 +411,12 @@ int rtw_createbss_cmd23a(struct rtw_adapter *padapter) 


	if (pmlmepriv->assoc_ssid.ssid_len == 0) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,

			 (" createbss for Any SSid:%s\n",

			  pmlmepriv->assoc_ssid.ssid));

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

			 "createbss for SSid:%s\n",

			 pmlmepriv->assoc_ssid.ssid);

	}



	pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
@@ -460,19 +459,18 @@ int rtw_joinbss_cmd23a(struct rtw_adapter *padapter, 


	if (pmlmepriv->assoc_ssid.ssid_len == 0) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,

			 ("+Join cmd: Any SSid\n"));

			 "+Join cmd: Any SSid\n");

	} else {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_,

			 ("+Join cmd: SSid =[%s]\n",

			  pmlmepriv->assoc_ssid.ssid));

			 "+Join cmd: SSid =[%s]\n",

			 pmlmepriv->assoc_ssid.ssid);

	}



	pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	if (!pcmd) {

		res = _FAIL;

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("rtw_joinbss_cmd23a: memory allocate for cmd_obj "

			  "fail!!!\n"));

			 "rtw_joinbss_cmd23a: memory allocate for cmd_obj fail!!!\n");

		goto exit;

	}
@@ -497,7 +495,7 @@ int rtw_joinbss_cmd23a(struct rtw_adapter *padapter, 
		res = _FAIL;



		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("rtw_joinbss_cmd23a :psecnetwork == NULL!!!\n"));

			 "rtw_joinbss_cmd23a :psecnetwork == NULL!!!\n");



		goto exit;

	}
@@ -599,7 +597,7 @@ int rtw_disassoc_cmd23a(struct rtw_adapter *padapter, u32 deauth_timeout_ms, 
	int res = _SUCCESS;



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_,

		 ("+rtw_disassoc_cmd23a\n"));

		 "+rtw_disassoc_cmd23a\n");



	/* prepare cmd parameter */

	param = kzalloc(sizeof(*param), GFP_ATOMIC);
@@ -1291,8 +1289,7 @@ void rtw_survey_cmd_callback23a(struct rtw_adapter *padapter, 
		mod_timer(&pmlmepriv->scan_to_timer,

			  jiffies + msecs_to_jiffies(1));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("\n ********Error: MgntActrtw_set_802_11_bssid23a_"

			  "LIST_SCAN Fail ************\n\n."));

			 "********Error: MgntActrtw_set_802_11_bssid23a_LIST_SCAN Fail ************\n");

	}



	/*  free cmd */
@@ -1309,7 +1306,7 @@ void rtw_disassoc_cmd23a_callback(struct rtw_adapter *padapter, 
		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."));

			 "***Error: disconnect_cmd_callback Fail ***\n");

		return;

	}
@@ -1329,8 +1326,7 @@ void rtw_joinbss_cmd23a_callback(struct rtw_adapter *padapter, 
			  jiffies + msecs_to_jiffies(1));

	} else if (pcmd->res != H2C_SUCCESS) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("********Error:rtw_select_and_join_from_scanned_"

			  "queue Wait Sema  Fail ************\n"));

			 "********Error:rtw_select_and_join_from_scanned_queue Wait Sema  Fail ************\n");

		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));

	}
@@ -1349,8 +1345,7 @@ void rtw_createbss_cmd23a_callback(struct rtw_adapter *padapter, 


	if (pcmd->res != H2C_SUCCESS) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("\n ********Error: rtw_createbss_cmd23a_callback  "

			  "Fail ************\n\n."));

			 "********Error: rtw_createbss_cmd23a_callback  Fail ************\n");

		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));

	}
@@ -1366,8 +1361,7 @@ void rtw_createbss_cmd23a_callback(struct rtw_adapter *padapter, 
						    GFP_KERNEL);

			if (!psta) {

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

					 ("\nCan't alloc sta_info when "

					  "createbss_cmd_callback\n"));

					 "Can't alloc sta_info when createbss_cmd_callback\n");

				goto createbss_cmd_fail;

			}

		}
@@ -1382,8 +1376,7 @@ void rtw_createbss_cmd23a_callback(struct rtw_adapter *padapter, 
			pwlan = rtw_get_oldest_wlan_network23a(&pmlmepriv->scanned_queue);

			if (!pwlan) {

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

					 ("\n Error:  can't get pwlan in "

					  "rtw23a_joinbss_event_cb\n"));

					 "Error:  can't get pwlan in rtw23a_joinbss_event_cb\n");

				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

				goto createbss_cmd_fail;

			}
@@ -1432,8 +1425,7 @@ void rtw_setstaKey_cmdrsp_callback23a(struct rtw_adapter *padapter, 


	if (!psta) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("\nERROR: rtw_setstaKey_cmdrsp_callback23a => "

			  "can't get sta_info\n\n"));

			 "ERROR: rtw_setstaKey_cmdrsp_callback23a => can't get sta_info\n");

		goto exit;

	}
@@ -1457,8 +1449,7 @@ void rtw_setassocsta_cmdrsp_callback23a(struct rtw_adapter *padapter, 


	if (psta == NULL) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("\nERROR: setassocsta_cmdrsp_callbac => can't "

			  "get sta_info\n\n"));

			 "ERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n");

		goto exit;

	}

drivers/staging/rtl8723au/core/rtw_efuse.c

+0 −3
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ EFUSE_Write1Byte(struct rtw_adapter *Adapter, u16 Address, u8 Value) 
	u32	k = 0;

	u16	contentLen = 0;



	/* RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr =%x Data =%x\n", Address, Value)); */

	EFUSE_GetEfuseDefinition23a(Adapter, EFUSE_WIFI,

				 TYPE_EFUSE_REAL_CONTENT_LEN,

				 (void *)&contentLen);
@@ -404,8 +403,6 @@ efuse_OneByteWrite23a(struct rtw_adapter *pAdapter, u16 addr, u8 data) 
	u8	tmpidx = 0;

	int	bResult;



	/* RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr = %x Data =%x\n", addr, data)); */



	/* return	0; */



	/*  -----------------e-fuse reg ctrl --------------------------------- */

drivers/staging/rtl8723au/core/rtw_ieee80211.c

+30 −34
Original line number Diff line number Diff line
@@ -472,8 +472,8 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int 
		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));

			 "%s: ie length mismatch, %u too much\n",

			 __func__, left);



		return _FAIL;

	}
@@ -487,9 +487,8 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int 


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

				 "%s: ie count botch (pairwise), count %u left %u\n",

				 __func__, count, left);

			return _FAIL;

		}
@@ -501,7 +500,7 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int 
		}

	} else if (left == 1) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("%s: ie too short (for key mgmt)", __func__));

			 "%s: ie too short (for key mgmt)\n", __func__);

		return _FAIL;

	}
@@ -510,8 +509,8 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int 
			pos += 2;

			if (!memcmp(pos, RTW_WPA_OUI23A_TYPE, 4)) {

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

					 ("%s : there has 802.1x auth\n",

					  __func__));

					 "%s : there has 802.1x auth\n",

					 __func__);

				*is_8021x = 1;

			}

		}
@@ -549,8 +548,8 @@ int rtw_parse_wpa2_ie23a(const u8 *rsn_ie, int rsn_ie_len, int *group_cipher, 
		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));

			 "%s: ie length mismatch, %u too much\n",

			 __func__, left);

		return _FAIL;

	}
@@ -563,9 +562,8 @@ int rtw_parse_wpa2_ie23a(const u8 *rsn_ie, int rsn_ie_len, int *group_cipher, 


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

				 "%s: ie count botch (pairwise), count %u left %u\n",

				 __func__, count, left);

			return _FAIL;

		}
@@ -577,7 +575,7 @@ int rtw_parse_wpa2_ie23a(const u8 *rsn_ie, int rsn_ie_len, int *group_cipher, 
		}

	} else if (left == 1) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("%s: ie too short (for key mgmt)",  __func__));

			 "%s: ie too short (for key mgmt)\n",  __func__);



		return _FAIL;

	}
@@ -587,8 +585,8 @@ int rtw_parse_wpa2_ie23a(const u8 *rsn_ie, int rsn_ie_len, int *group_cipher, 
			pos += 2;

			if (!memcmp(pos, SUITE_1X, 4)) {

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

					 ("%s (): there has 802.1x auth\n",

					  __func__));

					 "%s (): there has 802.1x auth\n",

					 __func__);

				*is_8021x = 1;

			}

		}
@@ -700,7 +698,7 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 


	if (pbuf && pbuf[1] > 0) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

			 ("rtw_get_cipher_info: wpa_ielen: %d", pbuf[1]));

			 "rtw_get_cipher_info: wpa_ielen: %d\n", pbuf[1]);

		r = rtw_parse_wpa_ie23a(pbuf, pbuf[1] + 2, &group_cipher,

				     &pairwise_cipher, &is8021x);

		if (r == _SUCCESS) {
@@ -708,10 +706,9 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 
			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));

				 "%s: pnetwork->pairwise_cipher: %d, is_8021x is %d\n",

				 __func__, pnetwork->BcnInfo.pairwise_cipher,

				 pnetwork->BcnInfo.is_8021x);

			ret = _SUCCESS;

		}

	} else {
@@ -719,24 +716,23 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 


		if (pbuf && pbuf[1] > 0) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

				 ("get RSN IE\n"));

				 "get RSN IE\n");

			r = rtw_parse_wpa2_ie23a(pbuf, pbuf[1] + 2,

					      &group_cipher, &pairwise_cipher,

					      &is8021x);

			if (r == _SUCCESS) {

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

					 ("get RSN IE  OK!!!\n"));

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

					 "%s: pnetwork->pairwise_cipher: %d,pnetwork->group_cipher is %d, is_8021x is %d\n",

					 __func__,

					 pnetwork->BcnInfo.pairwise_cipher,

					 pnetwork->BcnInfo.group_cipher,

					  pnetwork->BcnInfo.is_8021x));

					 pnetwork->BcnInfo.is_8021x);

				ret = _SUCCESS;

			}

		}
@@ -759,7 +755,7 @@ void rtw_get_bcn_info23a(struct wlan_network *pnetwork) 
		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("%s: ssid =%s\n", __func__, pnetwork->network.Ssid.ssid));

		 "%s: ssid =%s\n", __func__, pnetwork->network.Ssid.ssid);



	pie = pnetwork->network.IEs;

	pie_len = pnetwork->network.IELength;
@@ -776,11 +772,11 @@ void rtw_get_bcn_info23a(struct wlan_network *pnetwork) 
			pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WEP;

	}

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("%s: pnetwork->encryp_protocol is %x\n", __func__,

		  pnetwork->BcnInfo.encryp_protocol));

		 "%s: pnetwork->encryp_protocol is %x\n", __func__,

		 pnetwork->BcnInfo.encryp_protocol);

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("%s: pnetwork->encryp_protocol is %x\n", __func__,

		  pnetwork->BcnInfo.encryp_protocol));

		 "%s: pnetwork->encryp_protocol is %x\n", __func__,

		 pnetwork->BcnInfo.encryp_protocol);

	rtw_get_cipher_info(pnetwork);



	/* get bwmode and ch_offset */

drivers/staging/rtl8723au/core/rtw_mlme.c

+60 −72
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void rtw23a_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv) 
void rtw_free_mlme_priv23a(struct mlme_priv *pmlmepriv)

{

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		 ("rtw_free_mlme_priv23a\n"));

		 "rtw_free_mlme_priv23a\n");



	rtw23a_free_mlme_priv_ie_data(pmlmepriv);

}
@@ -196,9 +196,8 @@ int rtw_if_up23a(struct rtw_adapter *padapter) 
	if (padapter->bDriverStopped || padapter->bSurpriseRemoved ||

	    !check_fwstate(&padapter->mlmepriv, _FW_LINKED)) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

			 ("rtw_if_up23a:bDriverStopped(%d) OR "

			  "bSurpriseRemoved(%d)", padapter->bDriverStopped,

			  padapter->bSurpriseRemoved));

			 "rtw_if_up23a:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n",

			 padapter->bDriverStopped, padapter->bSurpriseRemoved);

		res = false;

	} else

		res =  true;
@@ -466,7 +465,7 @@ static void rtw_update_scanned_network(struct rtw_adapter *adapter, 
		if (!pnetwork) {

			if (!oldest) {

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

					 ("\n\n\nsomething wrong here\n\n\n"));

					 "something wrong here\n");

				goto exit;

			}

			pnetwork = oldest;
@@ -578,13 +577,12 @@ void rtw_survey_event_cb23a(struct rtw_adapter *adapter, const u8 *pbuf) 
	pnetwork = survey->bss;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("rtw_survey_event_cb23a, ssid=%s\n", pnetwork->Ssid.ssid));

		 "rtw_survey_event_cb23a, 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_cb23a: return a wrong "

			  "bss ***\n"));

			 "****rtw_survey_event_cb23a: return a wrong bss ***\n");

		return;

	}
@@ -592,8 +590,6 @@ void rtw_survey_event_cb23a(struct rtw_adapter *adapter, const u8 *pbuf) 


	/*  update IBSS_network 's timestamp */

	if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

		/* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		   "rtw_survey_event_cb23a : WIFI_ADHOC_MASTER_STATE\n\n"); */

		if (ether_addr_equal(pmlmepriv->cur_network.network.MacAddress,

				     pnetwork->MacAddress)) {

			struct wlan_network *ibss_wlan;
@@ -653,8 +649,8 @@ rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) 
	}



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("rtw_surveydone_event_callback23a: fw_state:%x\n\n",

		  get_fwstate(pmlmepriv)));

		 "rtw_surveydone_event_callback23a: fw_state:%x\n",

		 get_fwstate(pmlmepriv));



	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {

		del_timer_sync(&pmlmepriv->scan_to_timer);
@@ -662,8 +658,8 @@ rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) 
		_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)));

			 "nic status =%x, survey done event comes too late!\n",

			 get_fwstate(pmlmepriv));

	}



	rtw_set_signal_stat_timer(&adapter->recvpriv);
@@ -718,7 +714,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv) 
	struct rtw_queue *scan_queue = &pmlmepriv->scanned_queue;

	struct list_head *plist, *phead, *ptemp;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n"));

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, "+free_scanqueue\n");

	spin_lock_bh(&scan_queue->lock);



	phead = get_list_head(scan_queue);
@@ -745,11 +741,11 @@ void rtw_free_assoc_resources23a(struct rtw_adapter *adapter, 
	struct sta_info *psta;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,

		 ("+rtw_free_assoc_resources23a\n"));

		 "+rtw_free_assoc_resources23a\n");

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("tgt_network->network.MacAddress=%pM ssid=%s\n",

		 "tgt_network->network.MacAddress=%pM ssid=%s\n",

		 tgt_network->network.MacAddress,

		  tgt_network->network.Ssid.ssid));

		 tgt_network->network.Ssid.ssid);



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

		psta = rtw_get_stainfo23a(&adapter->stapriv,
@@ -781,7 +777,7 @@ void rtw_free_assoc_resources23a(struct rtw_adapter *adapter, 
		pwlan->fixed = false;

	else

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("rtw_free_assoc_resources23a : pwlan== NULL\n"));

			 "rtw_free_assoc_resources23a : pwlan== NULL\n");



	if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) &&

	    adapter->stapriv.asoc_sta_count == 1)
@@ -801,7 +797,7 @@ void rtw_indicate_connect23a(struct rtw_adapter *padapter) 
	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		 ("+rtw_indicate_connect23a\n"));

		 "+rtw_indicate_connect23a\n");



	pmlmepriv->to_join = false;
@@ -821,8 +817,8 @@ void rtw_indicate_connect23a(struct rtw_adapter *padapter) 
	rtw_set_scan_deny(padapter, 3000);



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		 ("-rtw_indicate_connect23a: fw_state=0x%08x\n",

		  get_fwstate(pmlmepriv)));

		 "-rtw_indicate_connect23a: fw_state=0x%08x\n",

		 get_fwstate(pmlmepriv));

}



/*
@@ -833,7 +829,7 @@ void rtw_indicate_disconnect23a(struct rtw_adapter *padapter) 
	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		 ("+rtw_indicate_disconnect23a\n"));

		 "+rtw_indicate_disconnect23a\n");



	_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS);
@@ -991,9 +987,9 @@ rtw_joinbss_update_network23a(struct rtw_adapter *padapter, 
	DBG_8723A("%s\n", __func__);



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

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

		 "fw_state:%x, BSSID:%pM\n",

		 get_fwstate(pmlmepriv),

		  pnetwork->network.MacAddress));

		 pnetwork->network.MacAddress);



	/*  why not use ptarget_wlan?? */

	memcpy(&cur_network->network, &pnetwork->network,
@@ -1036,7 +1032,7 @@ rtw_joinbss_update_network23a(struct rtw_adapter *padapter, 
	default:

		pmlmepriv->fw_state = WIFI_NULL_STATE;

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("Invalid network_mode\n"));

			 "Invalid network_mode\n");

		break;

	}
@@ -1071,16 +1067,16 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf) 
	bool the_same_macaddr;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("joinbss event call back received with res=%d\n",

		  pnetwork->join_res));

		 "joinbss event call back received with res=%d\n",

		 pnetwork->join_res);



	if (pmlmepriv->assoc_ssid.ssid_len == 0) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("@@@@@   joinbss event call back  for Any SSid\n"));

			 "@@@@@   joinbss event call back  for Any SSid\n");

	} else {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("@@@@@   rtw23a_joinbss_event_cb for SSid:%s\n",

			  pmlmepriv->assoc_ssid.ssid));

			 "@@@@@   rtw23a_joinbss_event_cb for SSid:%s\n",

			 pmlmepriv->assoc_ssid.ssid);

	}



	if (ether_addr_equal(pnetwork->network.MacAddress,
@@ -1092,15 +1088,14 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf) 
	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"));

			 "***joinbss_evt_callback return a wrong bss ***\n");

		return;

	}



	spin_lock_bh(&pmlmepriv->lock);



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("\n rtw23a_joinbss_event_cb !! _enter_critical\n"));

		 "rtw23a_joinbss_event_cb !! _enter_critical\n");



	if (pnetwork->join_res > 0) {

		spin_lock_bh(&pmlmepriv->scanned_queue.lock);
@@ -1149,8 +1144,7 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf) 
							      pnetwork);

			else {

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

					 ("Can't find ptarget_wlan when "

					  "joinbss_event callback\n"));

					 "Can't find ptarget_wlan when joinbss_event callback\n");

				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

				goto ignore_joinbss_callback;

			}
@@ -1163,8 +1157,7 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf) 
				if (!ptarget_sta) {

					RT_TRACE(_module_rtl871x_mlme_c_,

						 _drv_err_,

						 ("Can't update stainfo when "

						  "joinbss_event callback\n"));

						 "Can't update stainfo when joinbss_event callback\n");

					spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

					goto ignore_joinbss_callback;

				}
@@ -1177,19 +1170,19 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf) 
				/* adhoc mode will rtw_indicate_connect23a

				   when rtw_stassoc_event_callback23a */

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

					 ("adhoc mode, fw_state:%x",

					  get_fwstate(pmlmepriv)));

					 "adhoc mode, fw_state:%x\n",

					 get_fwstate(pmlmepriv));

			}



			/* s5. Cancle assoc_timer */

			del_timer_sync(&pmlmepriv->assoc_timer);



			RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

				 ("Cancle assoc_timer\n"));

				 "Cancle assoc_timer\n");

		} else {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

				 ("rtw23a_joinbss_event_cb err: fw_state:%x",

				 get_fwstate(pmlmepriv)));

				 "rtw23a_joinbss_event_cb err: fw_state:%x\n",

				 get_fwstate(pmlmepriv));

			spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

			goto ignore_joinbss_callback;

		}
@@ -1203,8 +1196,8 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf) 


		if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

				 ("fail! clear _FW_UNDER_LINKING ^^^fw_state="

				  "%x\n", get_fwstate(pmlmepriv)));

				 "fail! clear _FW_UNDER_LINKING ^^^fw_state=%x\n",

				 get_fwstate(pmlmepriv));

			_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

		}

	} else {
@@ -1255,8 +1248,7 @@ void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) 
	if (psta != NULL) {

		/* the sta have been in sta_info_queue => do nothing */

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("Error: rtw_stassoc_event_callback23a: sta has "

			  "been in sta_hash_queue\n"));

			 "Error: rtw_stassoc_event_callback23a: sta has been in sta_hash_queue\n");

		/* between drv has received this event before and

		   fw have not yet to set key to CAM_ENTRY) */

		return;
@@ -1266,8 +1258,7 @@ void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) 
		GFP_KERNEL);

	if (!psta) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("Can't alloc sta_info when "

			  "rtw_stassoc_event_callback23a\n"));

			 "Can't alloc sta_info when rtw_stassoc_event_callback23a\n");

		return;

	}
@@ -1645,8 +1636,8 @@ rtw_select_candidate_from_queue(struct mlme_priv *pmlmepriv) 
		pnetwork = container_of(plist, struct wlan_network, list);

		if (!pnetwork) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

				 ("%s: return _FAIL:(pnetwork == NULL)\n",

				  __func__));

				 "%s: return _FAIL:(pnetwork == NULL)\n",

				 __func__);

			goto exit;

		}
@@ -1672,7 +1663,7 @@ int rtw_do_join_adhoc(struct rtw_adapter *adapter) 
	_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		 ("switching to adhoc master\n"));

		 "switching to adhoc master\n");



	memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid,

	       sizeof(struct cfg80211_ssid));
@@ -1685,7 +1676,7 @@ int rtw_do_join_adhoc(struct rtw_adapter *adapter) 
	ret = rtw_createbss_cmd23a(adapter);

	if (ret != _SUCCESS) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("Error =>rtw_createbss_cmd23a status FAIL\n"));

			 "Error =>rtw_createbss_cmd23a status FAIL\n");

	} else  {

		pmlmepriv->to_join = false;

	}
@@ -1774,8 +1765,8 @@ int rtw_set_auth23a(struct rtw_adapter *adapter, 
	pcmd->rspsz = 0;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		 ("after enqueue set_auth_cmd, auth_mode=%x\n",

		  psecuritypriv->dot11AuthAlgrthm));

		 "after enqueue set_auth_cmd, auth_mode=%x\n",

		 psecuritypriv->dot11AuthAlgrthm);



	res = rtw_enqueue_cmd23a(pcmdpriv, pcmd);
@@ -1815,15 +1806,13 @@ int rtw_set_key23a(struct rtw_adapter *adapter, 
		psetkeyparm->algorithm = (unsigned char)

			psecuritypriv->dot118021XGrpPrivacy;

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("\n rtw_set_key23a: psetkeyparm->algorithm = "

			  "(unsigned char)psecuritypriv->dot118021XGrpPrivacy "

			  "=%d\n", psetkeyparm->algorithm));

			 "rtw_set_key23a: psetkeyparm->algorithm = (unsigned char)psecuritypriv->dot118021XGrpPrivacy =%d\n",

			 psetkeyparm->algorithm);

	} else {

		psetkeyparm->algorithm = (u8)psecuritypriv->dot11PrivacyAlgrthm;

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("\n rtw_set_key23a: psetkeyparm->algorithm = (u8)"

			  "psecuritypriv->dot11PrivacyAlgrthm =%d\n",

			  psetkeyparm->algorithm));

			 "rtw_set_key23a: psetkeyparm->algorithm = (u8)psecuritypriv->dot11PrivacyAlgrthm =%d\n",

			 psetkeyparm->algorithm);

	}

	psetkeyparm->keyid = keyid;/* 0~3 */

	psetkeyparm->set_tx = set_tx;
@@ -1834,8 +1823,8 @@ int rtw_set_key23a(struct rtw_adapter *adapter, 
		  psetkeyparm->algorithm, psetkeyparm->keyid,

		  pmlmepriv->key_mask);

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

		 ("\n rtw_set_key23a: psetkeyparm->algorithm =%d psetkeyparm->"

		  "keyid = (u8)keyid =%d\n", psetkeyparm->algorithm, keyid));

		 "rtw_set_key23a: psetkeyparm->algorithm =%d psetkeyparm->keyid = (u8)keyid =%d\n",

		 psetkeyparm->algorithm, keyid);



	switch (psetkeyparm->algorithm) {

	case WLAN_CIPHER_SUITE_WEP40:
@@ -1862,9 +1851,8 @@ int rtw_set_key23a(struct rtw_adapter *adapter, 
		break;

	default:

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("\n rtw_set_key23a:psecuritypriv->dot11PrivacyAlgrthm"

			  " = %x (must be 1 or 2 or 4 or 5)\n",

			  psecuritypriv->dot11PrivacyAlgrthm));

			 "rtw_set_key23a:psecuritypriv->dot11PrivacyAlgrthm = %x (must be 1 or 2 or 4 or 5)\n",

			 psecuritypriv->dot11PrivacyAlgrthm);

		res = _FAIL;

		kfree(pcmd);

		kfree(psetkeyparm);
@@ -1991,8 +1979,8 @@ int rtw_restruct_sec_ie23a(struct rtw_adapter *adapter, u8 *in_ie, u8 *out_ie, 
	uint ndissecuritytype = psecuritypriv->ndisencryptstatus;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,

		 ("+rtw_restruct_sec_ie23a: ndisauthmode=%d "

		  "ndissecuritytype=%d\n", ndisauthmode, ndissecuritytype));

		 "+rtw_restruct_sec_ie23a: ndisauthmode=%d ndissecuritytype=%d\n",

		 ndisauthmode, ndissecuritytype);



	ielength = 0;

	if (ndisauthmode == Ndis802_11AuthModeWPA ||
@@ -2058,8 +2046,8 @@ void rtw_update_registrypriv_dev_network23a(struct rtw_adapter *adapter) 


	pdev_network->DSConfig = pregistrypriv->channel;

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("pregistrypriv->channel =%d, pdev_network->DSConfig = 0x%x\n",

		  pregistrypriv->channel, pdev_network->DSConfig));

		 "pregistrypriv->channel =%d, pdev_network->DSConfig = 0x%x\n",

		 pregistrypriv->channel, pdev_network->DSConfig);



	if (cur_network->network.ifmode == NL80211_IFTYPE_ADHOC)

		pdev_network->ATIMWindow = 0;

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+12 −12
Original line number Diff line number Diff line
@@ -657,8 +657,8 @@ void mgt_dispatcher23a(struct rtw_adapter *padapter, 


	if (index > 13) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("Currently we do not support reserved sub-fr-type ="

			  "%d\n", index));

			 "Currently we do not support reserved sub-fr-type =%d\n",

			 index);

		return;

	}

	ptable += index;
@@ -2685,7 +2685,7 @@ static int _issue_probereq(struct rtw_adapter *padapter, 
	u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,

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

		 "+%s\n", __func__);



	pmgntframe = alloc_mgtxmitframe23a(pxmitpriv);

	if (!pmgntframe)
@@ -2756,7 +2756,7 @@ static int _issue_probereq(struct rtw_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));

		 "issuing probe_req, tx_len =%d\n", pattrib->last_txcmdsz);



	if (wait_ack) {

		ret = dump_mgntframe23a_and_wait_ack23a(padapter, pmgntframe);
@@ -4338,7 +4338,8 @@ static void start_create_ibss(struct rtw_adapter *padapter) 


		/* issue beacon */

		if (send_beacon23a(padapter) == _FAIL) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("issuing beacon frame fail....\n"));

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

				 "issuing beacon frame fail....\n");



			report_join_res23a(padapter, -1);

			pmlmeinfo->state = MSR_NOLINK;
@@ -4522,7 +4523,7 @@ static void process_80211d(struct rtw_adapter *padapter, 


		p += 3;

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,

			 ("%s: 802.11d country =%s\n", __func__, country));

			 "%s: 802.11d country =%s\n", __func__, country);



		i = 0;

		while ((ie - p) >= 3) {
@@ -4699,9 +4700,8 @@ static void process_80211d(struct rtw_adapter *padapter, 


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

					 "%s: change channel %d scan type from passive to active\n",

					 __func__, channel);

			}

			break;

		}
@@ -6057,7 +6057,7 @@ int mlme_evt_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf) 
	/*  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));

			 "Event Code(%d) mismatch!\n", evt_code);

		goto _abort_event_;

	}
@@ -6065,8 +6065,8 @@ int mlme_evt_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf) 
	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));

			 "Event(%d) Parm Size mismatch (%d vs %d)!\n",

			 evt_code, wlanevents[evt_code].parmsize, evt_sz);

		goto _abort_event_;

	}