diff options
| author | Joe Perches <joe@perches.com> | 2012-05-15 16:11:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-16 07:01:03 +0200 |
| commit | f32138319ca6541e65f95f8e17c9cc88ac1baf94 (patch) | |
| tree | 20505f3d5955d89d3763a6182052a8e9b37eaf37 /net/ipv6/ip6mr.c | |
| parent | netdev/phy: Make get_phy_id() static and quit EXPORTing it. (diff) | |
| download | linux-f32138319ca6541e65f95f8e17c9cc88ac1baf94.tar.xz linux-f32138319ca6541e65f95f8e17c9cc88ac1baf94.zip | |
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.c | 2 |
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) goto reg_notif_fail; #ifdef CONFIG_IPV6_PIMSM_V2 if (inet6_add_protocol(&pim6_protocol, IPPROTO_PIM) < 0) { - printk(KERN_ERR "ip6_mr_init: can't add PIM protocol\n"); + pr_err("%s: can't add PIM protocol\n", __func__); err = -EAGAIN; goto add_proto_fail; } |