aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6mr.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-05-15 10:11:53 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-16 01:01:03 -0400
commitf32138319ca6541e65f95f8e17c9cc88ac1baf94 (patch)
tree20505f3d5955d89d3763a6182052a8e9b37eaf37 /net/ipv6/ip6mr.c
parent82251de2a2b7b84987dde104d48a765b63170149 (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/ip6mr.c')
-rw-r--r--net/ipv6/ip6mr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index ba936e18b61b..b15dc08643a4 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1350,7 +1350,7 @@ int __init ip6_mr_init(void)
1350 goto reg_notif_fail; 1350 goto reg_notif_fail;
1351#ifdef CONFIG_IPV6_PIMSM_V2 1351#ifdef CONFIG_IPV6_PIMSM_V2
1352 if (inet6_add_protocol(&pim6_protocol, IPPROTO_PIM) < 0) { 1352 if (inet6_add_protocol(&pim6_protocol, IPPROTO_PIM) < 0) {
1353 printk(KERN_ERR "ip6_mr_init: can't add PIM protocol\n"); 1353 pr_err("%s: can't add PIM protocol\n", __func__);
1354 err = -EAGAIN; 1354 err = -EAGAIN;
1355 goto add_proto_fail; 1355 goto add_proto_fail;
1356 } 1356 }