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

staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_wlan_util.c 



Remove all RT_TRACE calls from core/rtw_wlan_util.c as this macro is
unnecessary, and these calls are dubious in terms of necessity.
Removing all calls will ultimately allow the removal of the macro
itself.

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


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

drivers/staging/rtl8188eu/core/rtw_wlan_util.c

+5 −22
Original line number Diff line number Diff line
@@ -871,11 +871,6 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
	memcpy(bssid->ssid.ssid, (p + 2), ssid_len);

	bssid->ssid.ssid_length = ssid_len;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s bssid.ssid.ssid:%s bssid.ssid.ssid_length:%d "

				"cur_network->network.ssid.ssid:%s len:%d\n", __func__, bssid->ssid.ssid,

				bssid->ssid.ssid_length, cur_network->network.ssid.ssid,

				cur_network->network.ssid.ssid_length));



	if (memcmp(bssid->ssid.ssid, cur_network->network.ssid.ssid, 32) ||

	    bssid->ssid.ssid_length != cur_network->network.ssid.ssid_length) {

		if (bssid->ssid.ssid[0] != '\0' && bssid->ssid.ssid_length != 0) /* not hidden ssid */
@@ -890,9 +885,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)

		goto _mismatch;
@@ -914,26 +906,17 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
		pbuf = rtw_get_wpa_ie(&bssid->ies[12], &wpa_ielen,

				      bssid->ie_length - 12);

		if (pbuf && (wpa_ielen > 0)) {

			if (rtw_parse_wpa_ie(pbuf, wpa_ielen + 2, &group_cipher, &pairwise_cipher, &is_8021x) == _SUCCESS) {

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



			if (pbuf && (wpa_ielen > 0)) {

				if (rtw_parse_wpa2_ie(pbuf, wpa_ielen + 2, &group_cipher, &pairwise_cipher, &is_8021x) == _SUCCESS) {

					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)

			goto _mismatch;