Commit e52c13d6 authored by Javier F. Arias's avatar Javier F. Arias Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Fix lines over 80 characters 



Fix lines over 80 characters by wrapping arguments in function calls,
improving the format for a better code readability.
Issue found by checkpatch.

Signed-off-by: default avatarJavier F. Arias <jarias.linux@gmail.com>
Link: https://lore.kernel.org/r/6a12577f3b95a77e060a2fb60ff17ce94774c076.1571284318.git.jarias.linux@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_security.c

+31 −9
Original line number Diff line number Diff line
@@ -303,8 +303,14 @@ void rtw_wep_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_, ("%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]));

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

		}



		WEP_SW_DEC_CNT_INC(psecuritypriv, prxattrib->ra);
@@ -839,9 +845,13 @@ 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_,

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

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

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

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

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

				res = _FAIL;

			}
@@ -1825,10 +1835,18 @@ static sint 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]));

			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, pframe[hdrlen+8+plen-8+i], message[hdrlen+8+plen-8+i]);

					__func__,

					i,

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

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

			res = _FAIL;

		}

	}
@@ -1859,7 +1877,9 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) 
	if (prxattrib->encrypt == _AES_) {

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

		if (stainfo != NULL) {

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

			RT_TRACE(_module_rtl871x_security_c_,

				 _drv_err_,

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



			if (IS_MCAST(prxattrib->ra)) {

				static unsigned long start;
@@ -1917,7 +1937,9 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) 


			AES_SW_DEC_CNT_INC(psecuritypriv, prxattrib->ra);

		} else {

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

			RT_TRACE(_module_rtl871x_security_c_,

				 _drv_err_,

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

			res = _FAIL;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE