Commit a46af2c8 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove RT_TRACE logs in core/rtw_security.c 



Remove all of the RT_TRACE logs in the core/rtw_security.c file as they
currently do nothing as they require the code to be modified by
hand in order to be turned on. This obviously has not happened
since the code was merged. Moreover it relies on an unneeded
private log level tracing which overrides the in-kernel public one,
so just remove them as they are unused.

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/14207c2b7ea789e8b0f3bd37d2758e979eff997c.1617545239.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_security.c

+1 −39
Original line number Diff line number Diff line
@@ -236,16 +236,6 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe) 
		/* calculate icv and compare the icv */

		*((u32 *)crc) = le32_to_cpu(getcrc32(payload, length-4));



		if (crc[3] != payload[length-1] || crc[2] != payload[length-2] || crc[1] != payload[length-3] || crc[0] != payload[length-4]) {

			RT_TRACE(_module_rtl871x_security_c_,

				 _drv_err_,

				 ("%s:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",

					__func__,

					crc[3], payload[length - 1],

					crc[2], payload[length - 2],

					crc[1], payload[length - 3],

					crc[0], payload[length - 4]));

		}

	}

}
@@ -609,8 +599,6 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe) 
	if (pattrib->encrypt == _TKIP_) {



		{

			RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));



			if (IS_MCAST(pattrib->ra))

				prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;

			else
@@ -631,7 +619,6 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe) 


				if ((curfragnum+1) == pattrib->nr_frags) {	/* 4 the last fragment */

					length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;

					RT_TRACE(_module_rtl871x_security_c_, _drv_info_, ("pattrib->iv_len =%x, pattrib->icv_len =%x\n", pattrib->iv_len, pattrib->icv_len));

					*((__le32 *)crc) = getcrc32(payload, length);/* modified by Amy*/



					arcfour_init(&mycontext, rc4key, 16);
@@ -739,18 +726,9 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) 


			*((u32 *)crc) = le32_to_cpu(getcrc32(payload, length-4));



			if (crc[3] != payload[length-1] || crc[2] != payload[length-2] || crc[1] != payload[length-3] || crc[0] != payload[length-4]) {

				RT_TRACE(_module_rtl871x_security_c_,

					 _drv_err_,

					 ("rtw_wep_decrypt:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",

						crc[3], payload[length - 1],

						crc[2], payload[length - 2],

						crc[1], payload[length - 3],

						crc[0], payload[length - 4]));

			if (crc[3] != payload[length-1] || crc[2] != payload[length-2] || crc[1] != payload[length-3] || crc[0] != payload[length-4])

				res = _FAIL;

			}

		} else {

			RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo == NULL!!!\n", __func__));

			res = _FAIL;

		}

	}
@@ -1380,8 +1358,6 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) 


	/* 4 start to encrypt each fragment */

	if (pattrib->encrypt == _AES_) {

		RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));



		if (IS_MCAST(pattrib->ra))

			prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;

		else
@@ -1611,13 +1587,6 @@ static signed int aes_decipher(u8 *key, uint hdrlen, 
	/* compare the mic */

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

		if (pframe[hdrlen+8+plen-8+i] != message[hdrlen+8+plen-8+i]) {

			RT_TRACE(_module_rtl871x_security_c_,

				 _drv_err_,

				 ("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n",

					__func__,

					i,

					pframe[hdrlen + 8 + plen - 8 + i],

					message[hdrlen + 8 + plen - 8 + i]));

			DBG_871X("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n",

					__func__,

					i,
@@ -1649,10 +1618,6 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) 
	if (prxattrib->encrypt == _AES_) {

		stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]);

		if (stainfo) {

			RT_TRACE(_module_rtl871x_security_c_,

				 _drv_err_,

				 ("%s: stainfo!= NULL!!!\n", __func__));



			if (IS_MCAST(prxattrib->ra)) {

				static unsigned long start;

				static u32 no_gkey_bc_cnt;
@@ -1706,9 +1671,6 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) 
			res = aes_decipher(prwskey, prxattrib->hdrlen, pframe, length);



		} else {

			RT_TRACE(_module_rtl871x_security_c_,

				 _drv_err_,

				 ("%s: stainfo == NULL!!!\n", __func__));

			res = _FAIL;

		}

	}