net: esp: Convert NETDEBUG to pr_info

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

Commit a2a316fd068c ("[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>

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index d2bf02e0a6787c2487ae09499d5b8dac1da4ac94..60173d4d3a0e335a91d2e9a463eeef6f6b88adfe 100644 (file)
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -603,12 +603,12 @@ static int esp_init_authenc(struct xfrm_state *x)
                BUG_ON(!aalg_desc);
 
                err = -EINVAL;
-               if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
+               if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=
                    crypto_aead_authsize(aead)) {
-                       NETDEBUG(KERN_INFO "ESP: %s digestsize %u != %hu\n",
-                                x->aalg->alg_name,
-                                crypto_aead_authsize(aead),
-                                aalg_desc->uinfo.auth.icv_fullbits/8);
+                       pr_info("ESP: %s digestsize %u != %hu\n",
+                               x->aalg->alg_name,
+                               crypto_aead_authsize(aead),
+                               aalg_desc->uinfo.auth.icv_fullbits / 8);
                        goto free_key;
                }
 

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 83fc3a385a26782c316914c4f8aafab78fe1a5e2..d21d7b22eebcd14d4ea26125c1e02a6273aade49 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -544,12 +544,12 @@ static int esp_init_authenc(struct xfrm_state *x)
                BUG_ON(!aalg_desc);
 
                err = -EINVAL;
-               if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
+               if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=
                    crypto_aead_authsize(aead)) {
-                       NETDEBUG(KERN_INFO "ESP: %s digestsize %u != %hu\n",
-                                x->aalg->alg_name,
-                                crypto_aead_authsize(aead),
-                                aalg_desc->uinfo.auth.icv_fullbits/8);
+                       pr_info("ESP: %s digestsize %u != %hu\n",
+                               x->aalg->alg_name,
+                               crypto_aead_authsize(aead),
+                               aalg_desc->uinfo.auth.icv_fullbits / 8);
                        goto free_key;
                }