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/esp4.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/esp4.c')
-rw-r--r-- | net/ipv4/esp4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index a5b413416da3..0a86dbe9454b 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
@@ -706,11 +706,11 @@ static const struct net_protocol esp4_protocol = { | |||
706 | static int __init esp4_init(void) | 706 | static int __init esp4_init(void) |
707 | { | 707 | { |
708 | if (xfrm_register_type(&esp_type, AF_INET) < 0) { | 708 | if (xfrm_register_type(&esp_type, AF_INET) < 0) { |
709 | printk(KERN_INFO "ip esp init: can't add xfrm type\n"); | 709 | pr_info("%s: can't add xfrm type\n", __func__); |
710 | return -EAGAIN; | 710 | return -EAGAIN; |
711 | } | 711 | } |
712 | if (inet_add_protocol(&esp4_protocol, IPPROTO_ESP) < 0) { | 712 | if (inet_add_protocol(&esp4_protocol, IPPROTO_ESP) < 0) { |
713 | printk(KERN_INFO "ip esp init: can't add protocol\n"); | 713 | pr_info("%s: can't add protocol\n", __func__); |
714 | xfrm_unregister_type(&esp_type, AF_INET); | 714 | xfrm_unregister_type(&esp_type, AF_INET); |
715 | return -EAGAIN; | 715 | return -EAGAIN; |
716 | } | 716 | } |
@@ -720,9 +720,9 @@ static int __init esp4_init(void) | |||
720 | static void __exit esp4_fini(void) | 720 | static void __exit esp4_fini(void) |
721 | { | 721 | { |
722 | if (inet_del_protocol(&esp4_protocol, IPPROTO_ESP) < 0) | 722 | if (inet_del_protocol(&esp4_protocol, IPPROTO_ESP) < 0) |
723 | printk(KERN_INFO "ip esp close: can't remove protocol\n"); | 723 | pr_info("%s: can't remove protocol\n", __func__); |
724 | if (xfrm_unregister_type(&esp_type, AF_INET) < 0) | 724 | if (xfrm_unregister_type(&esp_type, AF_INET) < 0) |
725 | printk(KERN_INFO "ip esp close: can't remove xfrm type\n"); | 725 | pr_info("%s: can't remove xfrm type\n", __func__); |
726 | } | 726 | } |
727 | 727 | ||
728 | module_init(esp4_init); | 728 | module_init(esp4_init); |