Commit 821e5079 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

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



Remove RT_TRACE macro calls from core/rtw_wlan_util.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/20210801190437.82017-4-phil@philpotter.co.uk


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

drivers/staging/r8188eu/core/rtw_wlan_util.c

+3 −22
Original line number Diff line number Diff line
@@ -1001,11 +1001,6 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
		bssid->Ssid.Ssid[0] = '\0';

	}



	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 */
@@ -1022,9 +1017,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_88E("%s(), privacy is not match return FAIL\n", __func__);

		goto _mismatch;
@@ -1049,25 +1041,14 @@ 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));

				}

			}

			if (pbuf && (wpa_ielen > 0))

				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_88E("%s pairwise_cipher(%x:%x) or group_cipher(%x:%x) is not match , return FAIL\n", __func__,

				pairwise_cipher, cur_network->BcnInfo.pairwise_cipher,