aboutsummaryrefslogtreecommitdiffstats
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
parent14df015bb1708cd7ba1e5af11a1b0365b165a3ef (diff)
ipv6: Use pr_warn() in ip6_fib.c
Signed-off-by: David S. Miller <davem@davemloft.net>
-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 e7b26dccd2d3..424f063fb229 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,
451 !ipv6_prefix_equal(&key->addr, addr, fn->fn_bit)) { 451 !ipv6_prefix_equal(&key->addr, addr, fn->fn_bit)) {
452 if (!allow_create) { 452 if (!allow_create) {
453 if (replace_required) { 453 if (replace_required) {
454 printk(KERN_WARNING 454 pr_warn("IPv6: Can't replace route, "
455 "IPv6: Can't replace route, no match found\n"); 455 "no match found\n");
456 return ERR_PTR(-ENOENT); 456 return ERR_PTR(-ENOENT);
457 } 457 }
458 printk(KERN_WARNING 458 pr_warn("IPv6: NLM_F_CREATE should be set "
459 "IPv6: NLM_F_CREATE should be set when creating new route\n"); 459 "when creating new route\n");
460 } 460 }
461 goto insert_above; 461 goto insert_above;
462 } 462 }
@@ -499,11 +499,11 @@ static struct fib6_node * fib6_add_1(struct fib6_node *root, void *addr,
499 * That would keep IPv6 consistent with IPv4 499 * That would keep IPv6 consistent with IPv4
500 */ 500 */
501 if (replace_required) { 501 if (replace_required) {
502 printk(KERN_WARNING 502 pr_warn("IPv6: Can't replace route, no match found\n");
503 "IPv6: Can't replace route, no match found\n");
504 return ERR_PTR(-ENOENT); 503 return ERR_PTR(-ENOENT);
505 } 504 }
506 printk(KERN_WARNING "IPv6: NLM_F_CREATE should be set when creating new route\n"); 505 pr_warn("IPv6: NLM_F_CREATE should be set "
506 "when creating new route\n");
507 } 507 }
508 /* 508 /*
509 * We walked to the bottom of tree. 509 * We walked to the bottom of tree.
@@ -697,7 +697,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
697 */ 697 */
698 if (!replace) { 698 if (!replace) {
699 if (!add) 699 if (!add)
700 printk(KERN_WARNING "IPv6: NLM_F_CREATE should be set when creating new route\n"); 700 pr_warn("IPv6: NLM_F_CREATE should be set when creating new route\n");
701 701
702add: 702add:
703 rt->dst.rt6_next = iter; 703 rt->dst.rt6_next = iter;
@@ -716,7 +716,7 @@ add:
716 if (!found) { 716 if (!found) {
717 if (add) 717 if (add)
718 goto add; 718 goto add;
719 printk(KERN_WARNING "IPv6: NLM_F_REPLACE set, but no existing node found!\n"); 719 pr_warn("IPv6: NLM_F_REPLACE set, but no existing node found!\n");
720 return -ENOENT; 720 return -ENOENT;
721 } 721 }
722 *ins = rt; 722 *ins = rt;
@@ -768,7 +768,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
768 replace_required = 1; 768 replace_required = 1;
769 } 769 }
770 if (!allow_create && !replace_required) 770 if (!allow_create && !replace_required)
771 printk(KERN_WARNING "IPv6: RTM_NEWROUTE with no NLM_F_CREATE or NLM_F_REPLACE\n"); 771 pr_warn("IPv6: RTM_NEWROUTE with no NLM_F_CREATE or NLM_F_REPLACE\n");
772 772
773 fn = fib6_add_1(root, &rt->rt6i_dst.addr, sizeof(struct in6_addr), 773 fn = fib6_add_1(root, &rt->rt6i_dst.addr, sizeof(struct in6_addr),
774 rt->rt6i_dst.plen, offsetof(struct rt6_info, rt6i_dst), 774 rt->rt6i_dst.plen, offsetof(struct rt6_info, rt6i_dst),