提交 45083497 编写于 作者: J Joe Perches 提交者: David S. Miller

net: esp: Convert NETDEBUG to pr_info

Commit 64ce2073 ("[NET]: Make NETDEBUG pure printk wrappers")
originally had these NETDEBUG printks as always emitting.

Commit a2a316fd ("[NET]: Replace CONFIG_NET_DEBUG with sysctl")
added a net_msg_warn sysctl to these NETDEBUG uses.

Convert these NETDEBUG uses to normal pr_info calls.

This changes the output prefix from "ESP: " to include
"IPSec: " for the ipv4 case and "IPv6: " for the ipv6 case.

These output lines are now like the other messages in the files.

Other miscellanea:

Neaten the arithmetic spacing to be consistent with other
arithmetic spacing in the files.
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 cbffccc9
...@@ -603,12 +603,12 @@ static int esp_init_authenc(struct xfrm_state *x) ...@@ -603,12 +603,12 @@ static int esp_init_authenc(struct xfrm_state *x)
BUG_ON(!aalg_desc); BUG_ON(!aalg_desc);
err = -EINVAL; err = -EINVAL;
if (aalg_desc->uinfo.auth.icv_fullbits/8 != if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=
crypto_aead_authsize(aead)) { crypto_aead_authsize(aead)) {
NETDEBUG(KERN_INFO "ESP: %s digestsize %u != %hu\n", pr_info("ESP: %s digestsize %u != %hu\n",
x->aalg->alg_name, x->aalg->alg_name,
crypto_aead_authsize(aead), crypto_aead_authsize(aead),
aalg_desc->uinfo.auth.icv_fullbits/8); aalg_desc->uinfo.auth.icv_fullbits / 8);
goto free_key; goto free_key;
} }
......
...@@ -544,12 +544,12 @@ static int esp_init_authenc(struct xfrm_state *x) ...@@ -544,12 +544,12 @@ static int esp_init_authenc(struct xfrm_state *x)
BUG_ON(!aalg_desc); BUG_ON(!aalg_desc);
err = -EINVAL; err = -EINVAL;
if (aalg_desc->uinfo.auth.icv_fullbits/8 != if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=
crypto_aead_authsize(aead)) { crypto_aead_authsize(aead)) {
NETDEBUG(KERN_INFO "ESP: %s digestsize %u != %hu\n", pr_info("ESP: %s digestsize %u != %hu\n",
x->aalg->alg_name, x->aalg->alg_name,
crypto_aead_authsize(aead), crypto_aead_authsize(aead),
aalg_desc->uinfo.auth.icv_fullbits/8); aalg_desc->uinfo.auth.icv_fullbits / 8);
goto free_key; goto free_key;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册