From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8AAF70 for ; Wed, 31 Mar 2021 09:40:17 +0000 (UTC) Received: by mail-ej1-f50.google.com with SMTP id r12so29088006ejr.5 for ; Wed, 31 Mar 2021 02:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EOd2VJooCVoEiBmjBW7G58vH0HOhKflugc8+m2NKCTM=; b=vaDGrBBU8lahs5xbCyKMHnaqeesduOiyCB/BJr1px9I/1D/ChRR044R6dE56RC012C 9njw54rJMqWskE6oaimcnM2ihMEPZpQ7pzQihKVA9PHGcQnZX+5UpFTzZhI49dvZkfon ZhJbyi3Y/6IsB/gql8vJPIzi3c/VfKGGBOveLpRVIZVOeBhtTOqETeJ7tecCz7uZpfcW WWqgfL99/zmqa3u1vWJZClP5x65lcGUB9d2i/UdLGSp6I3fkkDXedmr4aiMkJq2tIWZl 6rbKKLEWZ6fyQhkBinXMF3yX2k2jDsye71mP/WXSu2y5uyW7xXhqVuk4vRpJMUUqfN3Z sV7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EOd2VJooCVoEiBmjBW7G58vH0HOhKflugc8+m2NKCTM=; b=PcmlXgkILBa5neUFiv+OUx1fE/CAwpVufQyyXxdMUww57Mq4Te8/uG6Ha3IuAUGrnr wX/u/nL4kqXLZmeZRlrvh3pZSY596K9uXr78NVWmRu5l6KzCCtYSXFo7mx5fXQfeoiX4 Dgmio/MVzsfCb2MtrEUk9Mp6n3YrUeuxjU/UvB7kzLC4rsX53SAe9NpOhkxBGhsUfrWH J/Zu2qqxmdy7FrrOWcBSk1s/ivNBmhCQsAiWTbVR+tePw0PmFBmiR54A9vjZG3Q7Pwzf SipP4XPmaF7cvtiNFd1ImO9rUxKCzI6/TXYJA1U4rUPOhart5xXgwIckAbJ02QWtB6qh L0Zw== X-Gm-Message-State: AOAM530gd53IGcl9aXY5x8fk5lcH0Ga61QROOI6JL7PlthIzUJajVTH1 gld1K4y/X9nfHWLUJmOsOcY= X-Google-Smtp-Source: ABdhPJxmX838mmtzreh2tD3z6mA8tHKEkwO8kRwjX4UghnejZNgM52meCeFKsOgIGXkQoGVzHIvYZQ== X-Received: by 2002:a17:906:1352:: with SMTP id x18mr2463421ejb.545.1617183616296; Wed, 31 Mar 2021 02:40:16 -0700 (PDT) Received: from agape ([5.171.73.44]) by smtp.gmail.com with ESMTPSA id mc10sm828852ejb.56.2021.03.31.02.40.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 02:40:16 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: joe@perches.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Fabio Aiuto Subject: [PATCH 02/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_security.c Date: Wed, 31 Mar 2021 11:39:30 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit replace private macro RT_TRACE for tracing with in-kernel pr_* printk wrappers Signed-off-by: Fabio Aiuto --- drivers/staging/rtl8723bs/core/rtw_security.c | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c index 8a447e149438..5bdde7b8de01 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -237,14 +237,13 @@ 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", + pr_err("%s %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", + DRIVER_PREFIX, __func__, crc[3], payload[length - 1], crc[2], payload[length - 2], crc[1], payload[length - 3], - crc[0], payload[length - 4])); + crc[0], payload[length - 4]); } } } @@ -609,7 +608,7 @@ 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__)); + pr_err("%s %s: stainfo!= NULL!!!\n", DRIVER_PREFIX, __func__); if (IS_MCAST(pattrib->ra)) prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; @@ -631,7 +630,8 @@ 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)); + pr_info("%s %s: pattrib->iv_len =%x, pattrib->icv_len =%x\n", + DRIVER_PREFIX, __func__, pattrib->iv_len, pattrib->icv_len); *((__le32 *)crc) = getcrc32(payload, length);/* modified by Amy*/ arcfour_init(&mycontext, rc4key, 16); @@ -740,17 +740,16 @@ 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", + pr_err("%s %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", + DRIVER_PREFIX, __func__, crc[3], payload[length - 1], crc[2], payload[length - 2], crc[1], payload[length - 3], - crc[0], payload[length - 4])); + crc[0], payload[length - 4]); res = _FAIL; } } else { - RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo == NULL!!!\n", __func__)); + pr_err("%s %s: stainfo == NULL!!!\n", DRIVER_PREFIX, __func__); res = _FAIL; } } @@ -1380,7 +1379,7 @@ 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__)); + pr_err("%s %s: stainfo!= NULL!!!\n", DRIVER_PREFIX, __func__); if (IS_MCAST(pattrib->ra)) prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; @@ -1611,13 +1610,12 @@ 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", + pr_err("%s %s:mic check error mic[%d]: pframe(%x) != message(%x)\n", + DRIVER_PREFIX, __func__, i, pframe[hdrlen + 8 + plen - 8 + i], - message[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,9 +1647,7 @@ 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__)); + pr_err("%s %s: stainfo!= NULL!!!\n", DRIVER_PREFIX, __func__); if (IS_MCAST(prxattrib->ra)) { static unsigned long start; @@ -1706,9 +1702,7 @@ 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__)); + pr_err("%s %s: stainfo == NULL!!!\n", DRIVER_PREFIX, __func__); res = _FAIL; } } -- 2.20.1