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

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



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


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

drivers/staging/r8188eu/core/rtw_ieee80211.c

+6 −61
Original line number Diff line number Diff line
@@ -531,7 +531,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;

	}
@@ -541,11 +540,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);
@@ -554,19 +550,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;

}
@@ -598,7 +591,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;

	}
@@ -608,11 +600,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);
@@ -622,20 +611,16 @@ 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;

}
@@ -655,40 +640,16 @@ int 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 == _WPA_IE_ID_) && (!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 == _WPA2_IE_ID_) {

				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 {
@@ -1403,28 +1364,20 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 
	pbuf = rtw_get_wpa_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength-12);



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

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

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

			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.IELength-12);



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

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

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

				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;

			}

		}
@@ -1453,10 +1406,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.IELength, NULL, &rsn_len, NULL, &wpa_len);

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

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

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

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



	if (rsn_len > 0) {

		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WPA2;
@@ -1466,10 +1415,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_, ("rtw_get_bcn_info: pnetwork->encryp_protocol is %x\n",

		 pnetwork->BcnInfo.encryp_protocol));

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

		 pnetwork->BcnInfo.encryp_protocol));

	rtw_get_cipher_info(pnetwork);



	/* get bwmode and ch_offset */