Commit 5e28bb5a 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_ieee80211.c 



Remove all RT_TRACE calls from core/rtw_ieee80211.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.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210625000756.6313-13-phil@philpotter.co.uk


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

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+7 −64
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis 
		pos += WPA_SELECTOR_LEN;

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

		return _FAIL;

	}
@@ -380,11 +379,8 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis 
		pos += 2;

		left -= 2;



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

		if (count == 0 || left < count * WPA_SELECTOR_LEN)

			return _FAIL;

		}



		for (i = 0; i < count; i++) {

			*pairwise_cipher |= rtw_get_wpa_cipher_suite(pos);
@@ -393,19 +389,16 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis 
			left -= WPA_SELECTOR_LEN;

		}

	} else if (left == 1) {

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

		return _FAIL;

	}



	if (is_8021x) {

		if (left >= 6) {

			pos += 2;

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

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s : there has 802.1x auth\n", __func__));

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

				*is_8021x = 1;

		}

	}

	}



	return ret;

}
@@ -437,7 +430,6 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi 
		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));

		return _FAIL;

	}
@@ -447,11 +439,8 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi 
		pos += 2;

		left -= 2;



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

		if (count == 0 || left < count * RSN_SELECTOR_LEN)

			return _FAIL;

		}



		for (i = 0; i < count; i++) {

			*pairwise_cipher |= rtw_get_wpa2_cipher_suite(pos);
@@ -461,26 +450,22 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi 
		}



	} else if (left == 1) {

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



		return _FAIL;

	}



	if (is_8021x) {

		if (left >= 6) {

			pos += 2;

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

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s (): there has 802.1x auth\n", __func__));

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

				*is_8021x = 1;

		}

	}

	}

	return ret;

}



void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie, u16 *wpa_len)

{

	u8 authmode, sec_idx, i;

	u8 authmode, sec_idx;

	u8 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01};

	uint cnt;
@@ -494,40 +479,16 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie 
		authmode = in_ie[cnt];



		if ((authmode == WLAN_EID_VENDOR_SPECIFIC) && (!memcmp(&in_ie[cnt + 2], &wpa_oui[0], 4))) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

				 ("\n rtw_get_wpa_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n",

				 sec_idx, in_ie[cnt + 1] + 2));



			if (wpa_ie) {

			if (wpa_ie)

				memcpy(wpa_ie, &in_ie[cnt], in_ie[cnt + 1] + 2);



				for (i = 0; i < (in_ie[cnt + 1] + 2); i += 8) {

					RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

						 ("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n",

						 wpa_ie[i], wpa_ie[i + 1], wpa_ie[i + 2], wpa_ie[i + 3], wpa_ie[i + 4],

						 wpa_ie[i + 5], wpa_ie[i + 6], wpa_ie[i + 7]));

				}

			}



			*wpa_len = in_ie[cnt + 1] + 2;

			cnt += in_ie[cnt + 1] + 2;  /* get next */

		} else {

			if (authmode == WLAN_EID_RSN) {

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

					 ("\n get_rsn_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n",

					 sec_idx, in_ie[cnt + 1] + 2));



				if (rsn_ie) {

				if (rsn_ie)

					memcpy(rsn_ie, &in_ie[cnt], in_ie[cnt + 1] + 2);



					for (i = 0; i < (in_ie[cnt + 1] + 2); i += 8) {

						RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

							 ("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n",

							 rsn_ie[i], rsn_ie[i + 1], rsn_ie[i + 2], rsn_ie[i + 3], rsn_ie[i + 4],

							 rsn_ie[i + 5], rsn_ie[i + 6], rsn_ie[i + 7]));

						}

				}



				*rsn_len = in_ie[cnt + 1] + 2;

				cnt += in_ie[cnt + 1] + 2;  /* get next */

			} else {
@@ -895,30 +856,20 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 
	pbuf = rtw_get_wpa_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length - 12);



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

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: wpa_ielen: %d", __func__, wpa_ielen));

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

			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, is_8021x is %d",

				  __func__, pnetwork->BcnInfo.pairwise_cipher,

				  pnetwork->BcnInfo.is_8021x));

			ret = _SUCCESS;

		}

	} else {

		pbuf = rtw_get_wpa2_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length - 12);



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

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("get RSN IE\n"));

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

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("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__, pnetwork->BcnInfo.pairwise_cipher,

							pnetwork->BcnInfo.group_cipher, pnetwork->BcnInfo.is_8021x));

				ret = _SUCCESS;

			}

		}
@@ -946,10 +897,6 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;

	}

	rtw_get_sec_ie(pnetwork->network.ies, pnetwork->network.ie_length, NULL, &rsn_len, NULL, &wpa_len);

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

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: wpa_len =%d rsn_len =%d\n", __func__, wpa_len, rsn_len));

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

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: wpa_len =%d rsn_len =%d\n", __func__, wpa_len, rsn_len));



	if (rsn_len > 0) {

		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WPA2;
@@ -959,10 +906,6 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
		if (bencrypt)

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

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: pnetwork->encryp_protocol is %x\n",

							__func__, pnetwork->BcnInfo.encryp_protocol));

	rtw_get_cipher_info(pnetwork);



	/* get bwmode and ch_offset */