diff options
author | Joe Perches <joe@perches.com> | 2012-03-11 14:36:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-12 02:42:51 -0400 |
commit | 058bd4d2a4ff0aaa4a5381c67e776729d840c785 (patch) | |
tree | 4d1ea864a8740676c7e7c5a03cdaa67fc5f29418 /net/ipv4/ah4.c | |
parent | 43db362d3adda9e0a915ddb9a8d1a41186e19179 (diff) |
net: Convert printks to pr_<level>
Use a more current kernel messaging style.
Convert a printk block to print_hex_dump.
Coalesce formats, align arguments.
Use %s, __func__ instead of embedding function names.
Some messages that were prefixed with <foo>_close are
now prefixed with <foo>_fini. Some ah4 and esp messages
are now not prefixed with "ip ".
The intent of this patch is to later add something like
#define pr_fmt(fmt) "IPv4: " fmt.
to standardize the output messages.
Text size is trivially reduced. (x86-32 allyesconfig)
$ size net/ipv4/built-in.o*
text data bss dec hex filename
887888 31558 249696 1169142 11d6f6 net/ipv4/built-in.o.new
887934 31558 249800 1169292 11d78c net/ipv4/built-in.o.old
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ah4.c')
-rw-r--r-- | net/ipv4/ah4.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index 36d14406261e..b5524660c81d 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c | |||
@@ -445,9 +445,9 @@ static int ah_init_state(struct xfrm_state *x) | |||
445 | 445 | ||
446 | if (aalg_desc->uinfo.auth.icv_fullbits/8 != | 446 | if (aalg_desc->uinfo.auth.icv_fullbits/8 != |
447 | crypto_ahash_digestsize(ahash)) { | 447 | crypto_ahash_digestsize(ahash)) { |
448 | printk(KERN_INFO "AH: %s digestsize %u != %hu\n", | 448 | pr_info("AH: %s digestsize %u != %hu\n", |
449 | x->aalg->alg_name, crypto_ahash_digestsize(ahash), | 449 | x->aalg->alg_name, crypto_ahash_digestsize(ahash), |
450 | aalg_desc->uinfo.auth.icv_fullbits/8); | 450 | aalg_desc->uinfo.auth.icv_fullbits/8); |
451 | goto error; | 451 | goto error; |
452 | } | 452 | } |
453 | 453 | ||
@@ -510,11 +510,11 @@ static const struct net_protocol ah4_protocol = { | |||
510 | static int __init ah4_init(void) | 510 | static int __init ah4_init(void) |
511 | { | 511 | { |
512 | if (xfrm_register_type(&ah_type, AF_INET) < 0) { | 512 | if (xfrm_register_type(&ah_type, AF_INET) < 0) { |
513 | printk(KERN_INFO "ip ah init: can't add xfrm type\n"); | 513 | pr_info("%s: can't add xfrm type\n", __func__); |
514 | return -EAGAIN; | 514 | return -EAGAIN; |
515 | } | 515 | } |
516 | if (inet_add_protocol(&ah4_protocol, IPPROTO_AH) < 0) { | 516 | if (inet_add_protocol(&ah4_protocol, IPPROTO_AH) < 0) { |
517 | printk(KERN_INFO "ip ah init: can't add protocol\n"); | 517 | pr_info("%s: can't add protocol\n", __func__); |
518 | xfrm_unregister_type(&ah_type, AF_INET); | 518 | xfrm_unregister_type(&ah_type, AF_INET); |
519 | return -EAGAIN; | 519 | return -EAGAIN; |
520 | } | 520 | } |
@@ -524,9 +524,9 @@ static int __init ah4_init(void) | |||
524 | static void __exit ah4_fini(void) | 524 | static void __exit ah4_fini(void) |
525 | { | 525 | { |
526 | if (inet_del_protocol(&ah4_protocol, IPPROTO_AH) < 0) | 526 | if (inet_del_protocol(&ah4_protocol, IPPROTO_AH) < 0) |
527 | printk(KERN_INFO "ip ah close: can't remove protocol\n"); | 527 | pr_info("%s: can't remove protocol\n", __func__); |
528 | if (xfrm_unregister_type(&ah_type, AF_INET) < 0) | 528 | if (xfrm_unregister_type(&ah_type, AF_INET) < 0) |
529 | printk(KERN_INFO "ip ah close: can't remove xfrm type\n"); | 529 | pr_info("%s: can't remove xfrm type\n", __func__); |
530 | } | 530 | } |
531 | 531 | ||
532 | module_init(ah4_init); | 532 | module_init(ah4_init); |