diff options
| author | Joe Perches <joe@perches.com> | 2014-11-05 15:36:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-06 15:11:10 -0500 |
| commit | 450834977796cc74d1265d7dfe69cf6767537dfc (patch) | |
| tree | e0c644e9978c7030c4109759d4b33e38fb002fb8 | |
| parent | cbffccc970394f82e397fccbeb136eeaffb3c552 (diff) | |
| download | op-kernel-dev-450834977796cc74d1265d7dfe69cf6767537dfc.zip op-kernel-dev-450834977796cc74d1265d7dfe69cf6767537dfc.tar.gz | |
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>
| -rw-r--r-- | net/ipv4/esp4.c | 10 | ||||
| -rw-r--r-- | net/ipv6/esp6.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index d2bf02e..60173d4 100644 --- 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 83fc3a3..d21d7b2 100644 --- 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; } |
