Commit 45083497 authored Nov 05, 2014 by Joe Perches Committed by David S. Miller Nov 06, 2014

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: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent cbffccc9

net/ipv4/esp4.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -605,7 +605,7 @@ static int esp_init_authenc(struct xfrm_state *x)
		err = -EINVAL;
		if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=
		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,
		crypto_aead_authsize(aead),
		aalg_desc->uinfo.auth.icv_fullbits / 8);

net/ipv6/esp6.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -546,7 +546,7 @@ static int esp_init_authenc(struct xfrm_state *x)
		err = -EINVAL;
		if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=
		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,
		crypto_aead_authsize(aead),
		aalg_desc->uinfo.auth.icv_fullbits / 8);

Admin message