diff options
author | Joe Perches <joe@perches.com> | 2012-05-15 10:11:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-16 01:01:03 -0400 |
commit | f32138319ca6541e65f95f8e17c9cc88ac1baf94 (patch) | |
tree | 20505f3d5955d89d3763a6182052a8e9b37eaf37 /net/ipv6/sit.c | |
parent | 82251de2a2b7b84987dde104d48a765b63170149 (diff) |
net: ipv6: Standardize prefixes for message logging
Add #define pr_fmt(fmt) as appropriate.
Add "IPv6: " to appropriate files.
Convert printk(KERN_<LEVEL> to pr_<level> (but not KERN_DEBUG).
Standardize on "%s: " not "%s(): " when emitting __func__.
Use "%s: ", __func__ instead of embedding function name.
Coalesce formats, align arguments.
ADDRCONF output is now prefixed with "IPv6: "
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index a36a09701bff..60415711563f 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -17,6 +17,8 @@ | |||
17 | * Fred Templin <fred.l.templin@boeing.com>: isatap support | 17 | * Fred Templin <fred.l.templin@boeing.com>: isatap support |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
21 | |||
20 | #include <linux/module.h> | 22 | #include <linux/module.h> |
21 | #include <linux/capability.h> | 23 | #include <linux/capability.h> |
22 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
@@ -1301,7 +1303,7 @@ static int __init sit_init(void) | |||
1301 | { | 1303 | { |
1302 | int err; | 1304 | int err; |
1303 | 1305 | ||
1304 | printk(KERN_INFO "IPv6 over IPv4 tunneling driver\n"); | 1306 | pr_info("IPv6 over IPv4 tunneling driver\n"); |
1305 | 1307 | ||
1306 | err = register_pernet_device(&sit_net_ops); | 1308 | err = register_pernet_device(&sit_net_ops); |
1307 | if (err < 0) | 1309 | if (err < 0) |
@@ -1309,7 +1311,7 @@ static int __init sit_init(void) | |||
1309 | err = xfrm4_tunnel_register(&sit_handler, AF_INET6); | 1311 | err = xfrm4_tunnel_register(&sit_handler, AF_INET6); |
1310 | if (err < 0) { | 1312 | if (err < 0) { |
1311 | unregister_pernet_device(&sit_net_ops); | 1313 | unregister_pernet_device(&sit_net_ops); |
1312 | printk(KERN_INFO "sit init: Can't add protocol\n"); | 1314 | pr_info("%s: can't add protocol\n", __func__); |
1313 | } | 1315 | } |
1314 | return err; | 1316 | return err; |
1315 | } | 1317 | } |