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/tunnel4.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/tunnel4.c')
-rw-r--r-- | net/ipv4/tunnel4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tunnel4.c b/net/ipv4/tunnel4.c index 01775983b99..0d017183062 100644 --- a/net/ipv4/tunnel4.c +++ b/net/ipv4/tunnel4.c | |||
@@ -164,12 +164,12 @@ static const struct net_protocol tunnel64_protocol = { | |||
164 | static int __init tunnel4_init(void) | 164 | static int __init tunnel4_init(void) |
165 | { | 165 | { |
166 | if (inet_add_protocol(&tunnel4_protocol, IPPROTO_IPIP)) { | 166 | if (inet_add_protocol(&tunnel4_protocol, IPPROTO_IPIP)) { |
167 | printk(KERN_ERR "tunnel4 init: can't add protocol\n"); | 167 | pr_err("%s: can't add protocol\n", __func__); |
168 | return -EAGAIN; | 168 | return -EAGAIN; |
169 | } | 169 | } |
170 | #if IS_ENABLED(CONFIG_IPV6) | 170 | #if IS_ENABLED(CONFIG_IPV6) |
171 | if (inet_add_protocol(&tunnel64_protocol, IPPROTO_IPV6)) { | 171 | if (inet_add_protocol(&tunnel64_protocol, IPPROTO_IPV6)) { |
172 | printk(KERN_ERR "tunnel64 init: can't add protocol\n"); | 172 | pr_err("tunnel64 init: can't add protocol\n"); |
173 | inet_del_protocol(&tunnel4_protocol, IPPROTO_IPIP); | 173 | inet_del_protocol(&tunnel4_protocol, IPPROTO_IPIP); |
174 | return -EAGAIN; | 174 | return -EAGAIN; |
175 | } | 175 | } |
@@ -181,10 +181,10 @@ static void __exit tunnel4_fini(void) | |||
181 | { | 181 | { |
182 | #if IS_ENABLED(CONFIG_IPV6) | 182 | #if IS_ENABLED(CONFIG_IPV6) |
183 | if (inet_del_protocol(&tunnel64_protocol, IPPROTO_IPV6)) | 183 | if (inet_del_protocol(&tunnel64_protocol, IPPROTO_IPV6)) |
184 | printk(KERN_ERR "tunnel64 close: can't remove protocol\n"); | 184 | pr_err("tunnel64 close: can't remove protocol\n"); |
185 | #endif | 185 | #endif |
186 | if (inet_del_protocol(&tunnel4_protocol, IPPROTO_IPIP)) | 186 | if (inet_del_protocol(&tunnel4_protocol, IPPROTO_IPIP)) |
187 | printk(KERN_ERR "tunnel4 close: can't remove protocol\n"); | 187 | pr_err("tunnel4 close: can't remove protocol\n"); |
188 | } | 188 | } |
189 | 189 | ||
190 | module_init(tunnel4_init); | 190 | module_init(tunnel4_init); |