Skip to content

Commit

Permalink
staging: rtl8723au: Use __func__ in trace logs
Browse files Browse the repository at this point in the history 
Rework the trace log-related lines in rtl8723au's rtw_security.c
to use the __func__ GCC magic variable instead of hardcoding the
function names into the trace log strings. This also corrects a
copy-paste-related typo in the function named rtw_tkip_decrypt23a.

Thanks to Jes Sorensen for the suggestion to use __func__.

Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
M. Vefa Bicakci authored and Greg Kroah-Hartman committed Apr 3, 2015
1 parent 87a4329 commit 58b39a9
Showing 1 changed file with 22 additions and 19 deletions.
41 changes: 22 additions & 19 deletions drivers/staging/rtl8723au/core/rtw_security.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ void rtw_wep_decrypt23a(struct rtw_adapter *padapter,

if (actual_crc != expected_crc) {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"rtw_wep_decrypt23a:icv CRC mismatch: "
"%s:icv CRC mismatch: "
"actual: %08x, expected: %08x\n",
actual_crc, expected_crc);
__func__, actual_crc, expected_crc);
}
}

Expand Down Expand Up @@ -635,13 +635,13 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,

if (stainfo == NULL) {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"rtw_tkip_encrypt23a: stainfo == NULL!!!\n");
"%s: stainfo == NULL!!!\n", __func__);
DBG_8723A("%s, psta == NUL\n", __func__);
return _FAIL;
}

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

if (!(stainfo->state & _FW_LINKED)) {
DBG_8723A("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state);
Expand Down Expand Up @@ -733,7 +733,7 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
&prxattrib->ta[0]);
if (stainfo == NULL) {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"rtw_tkip_decrypt23a: stainfo == NULL!!!\n");
"%s: stainfo == NULL!!!\n", __func__);
return _FAIL;
}

Expand All @@ -748,7 +748,7 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
prwskeylen = 16;
} else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"rtw_tkip_decrypt23a: stainfo!= NULL!!!\n");
"%s: stainfo!= NULL!!!\n", __func__);
prwskey = &stainfo->dot118021x_UncstKey.skey[0];
prwskeylen = 16;
}
Expand All @@ -774,9 +774,9 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,

if (actual_crc != expected_crc) {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"rtw_wep_decrypt23a:icv CRC mismatch: "
"%s:icv CRC mismatch: "
"actual: %08x, expected: %08x\n",
actual_crc, expected_crc);
__func__, actual_crc, expected_crc);
res = _FAIL;
}

Expand Down Expand Up @@ -1313,7 +1313,7 @@ int rtw_aes_encrypt23a(struct rtw_adapter *padapter,

if (!stainfo) {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"rtw_aes_encrypt23a: stainfo == NULL!!!\n");
"%s: stainfo == NULL!!!\n", __func__);
DBG_8723A("%s, psta == NUL\n", __func__);
res = _FAIL;
goto out;
Expand All @@ -1324,7 +1324,7 @@ int rtw_aes_encrypt23a(struct rtw_adapter *padapter,
return _FAIL;
}
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"rtw_aes_encrypt23a: stainfo!= NULL!!!\n");
"%s: stainfo!= NULL!!!\n", __func__);

if (is_multicast_ether_addr(pattrib->ra))
prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
Expand Down Expand Up @@ -1552,11 +1552,14 @@ static int aes_decipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
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_,
"aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
i, pframe[hdrlen + 8 + plen - 8 + i],
"%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_8723A("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
i, pframe[hdrlen + 8 + plen - 8 + i], message[hdrlen + 8 + plen - 8 + i]);
DBG_8723A("%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]);
res = _FAIL;
}
}
Expand All @@ -1582,13 +1585,13 @@ int rtw_aes_decrypt23a(struct rtw_adapter *padapter,
stainfo = rtw_get_stainfo23a(&padapter->stapriv, &prxattrib->ta[0]);
if (!stainfo) {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"rtw_aes_encrypt23a: stainfo == NULL!!!\n");
"%s: stainfo == NULL!!!\n", __func__);
res = _FAIL;
goto exit;
}

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

if (is_multicast_ether_addr(prxattrib->ra)) {
/* in concurrent we should use sw decrypt in
Expand Down Expand Up @@ -1624,9 +1627,9 @@ void rtw_use_tkipkey_handler23a(void *FunctionContext)
struct rtw_adapter *padapter = (struct rtw_adapter *)FunctionContext;

RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"^^^rtw_use_tkipkey_handler23a ^^^\n");
"^^^%s ^^^\n", __func__);
padapter->securitypriv.busetkipkey = 1;
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"^^^rtw_use_tkipkey_handler23a padapter->securitypriv.busetkipkey =%d^^^\n",
padapter->securitypriv.busetkipkey);
"^^^%s padapter->securitypriv.busetkipkey =%d^^^\n",
__func__, padapter->securitypriv.busetkipkey);
}

0 comments on commit 58b39a9

Please sign in to comment.