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/route.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/route.c')
-rw-r--r-- | net/ipv6/route.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e20e32069024..90119a32b89d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -24,6 +24,8 @@ | |||
24 | * Fixed routing subtrees. | 24 | * Fixed routing subtrees. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #define pr_fmt(fmt) "IPv6: " fmt | ||
28 | |||
27 | #include <linux/capability.h> | 29 | #include <linux/capability.h> |
28 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
29 | #include <linux/export.h> | 31 | #include <linux/export.h> |
@@ -794,7 +796,7 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, | |||
794 | goto retry; | 796 | goto retry; |
795 | } | 797 | } |
796 | 798 | ||
797 | net_warn_ratelimited("ipv6: Neighbour table overflow\n"); | 799 | net_warn_ratelimited("Neighbour table overflow\n"); |
798 | dst_free(&rt->dst); | 800 | dst_free(&rt->dst); |
799 | return NULL; | 801 | return NULL; |
800 | } | 802 | } |
@@ -1280,7 +1282,7 @@ int ip6_route_add(struct fib6_config *cfg) | |||
1280 | !(cfg->fc_nlinfo.nlh->nlmsg_flags & NLM_F_CREATE)) { | 1282 | !(cfg->fc_nlinfo.nlh->nlmsg_flags & NLM_F_CREATE)) { |
1281 | table = fib6_get_table(net, cfg->fc_table); | 1283 | table = fib6_get_table(net, cfg->fc_table); |
1282 | if (!table) { | 1284 | if (!table) { |
1283 | printk(KERN_WARNING "IPv6: NLM_F_CREATE should be specified when creating new route\n"); | 1285 | pr_warn("NLM_F_CREATE should be specified when creating new route\n"); |
1284 | table = fib6_new_table(net, cfg->fc_table); | 1286 | table = fib6_new_table(net, cfg->fc_table); |
1285 | } | 1287 | } |
1286 | } else { | 1288 | } else { |
@@ -2102,7 +2104,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, | |||
2102 | int err; | 2104 | int err; |
2103 | 2105 | ||
2104 | if (!rt) { | 2106 | if (!rt) { |
2105 | net_warn_ratelimited("IPv6: Maximum number of routes reached, consider increasing route/max_size\n"); | 2107 | net_warn_ratelimited("Maximum number of routes reached, consider increasing route/max_size\n"); |
2106 | return ERR_PTR(-ENOMEM); | 2108 | return ERR_PTR(-ENOMEM); |
2107 | } | 2109 | } |
2108 | 2110 | ||