summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_fib.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-11-17 03:18:28 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-17 03:18:28 -0500
commit8d26784cf0d04c1238e906efdd5de76439cb0a1e (patch)
tree7a32defb4a9bf4430eac2fc589d45f6aea1c2b63 /net/ipv6/ip6_fib.c
parent14df015bb1708cd7ba1e5af11a1b0365b165a3ef (diff)
ipv6: Use pr_warn() in ip6_fib.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
-rw-r--r--net/ipv6/ip6_fib.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index e7b26dccd2d..424f063fb22 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -451,12 +451,12 @@ static struct fib6_node * fib6_add_1(struct fib6_node *root, void *addr,
!ipv6_prefix_equal(&key->addr, addr, fn->fn_bit)) {
if (!allow_create) {
if (replace_required) {
- printk(KERN_WARNING
- "IPv6: Can't replace route, no match found\n");
+ pr_warn("IPv6: Can't replace route, "
+ "no match found\n");
return ERR_PTR(-ENOENT);
}
- printk(KERN_WARNING
- "IPv6: NLM_F_CREATE should be set when creating new route\n");
+ pr_warn("IPv6: NLM_F_CREATE should be set "
+ "when creating new route\n");
}
goto insert_above;
}
@@ -499,11 +499,11 @@ static struct fib6_node * fib6_add_1(struct fib6_node *root, void *addr,
* That would keep IPv6 consistent with IPv4
*/
if (replace_required) {
- printk(KERN_WARNING
- "IPv6: Can't replace route, no match found\n");
+ pr_warn("IPv6: Can't replace route, no match found\n");
return ERR_PTR(-ENOENT);
}
- printk(KERN_WARNING "IPv6: NLM_F_CREATE should be set when creating new route\n");
+ pr_warn("IPv6: NLM_F_CREATE should be set "
+ "when creating new route\n");
}
/*
* We walked to the bottom of tree.
@@ -697,7 +697,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
*/
if (!replace) {
if (!add)
- printk(KERN_WARNING "IPv6: NLM_F_CREATE should be set when creating new route\n");
+ pr_warn("IPv6: NLM_F_CREATE should be set when creating new route\n");
add:
rt->dst.rt6_next = iter;
@@ -716,7 +716,7 @@ add:
if (!found) {
if (add)
goto add;
- printk(KERN_WARNING "IPv6: NLM_F_REPLACE set, but no existing node found!\n");
+ pr_warn("IPv6: NLM_F_REPLACE set, but no existing node found!\n");
return -ENOENT;
}
*ins = rt;
@@ -768,7 +768,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
replace_required = 1;
}
if (!allow_create && !replace_required)
- printk(KERN_WARNING "IPv6: RTM_NEWROUTE with no NLM_F_CREATE or NLM_F_REPLACE\n");
+ pr_warn("IPv6: RTM_NEWROUTE with no NLM_F_CREATE or NLM_F_REPLACE\n");
fn = fib6_add_1(root, &rt->rt6i_dst.addr, sizeof(struct in6_addr),
rt->rt6i_dst.plen, offsetof(struct rt6_info, rt6i_dst),