From 3858cfe0a3e221d4f20f6fde740cf39dde7b6e2c Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 17 Nov 2011 03:18:28 -0500 Subject: [PATCH] --- yaml --- r: 277595 b: refs/heads/master c: 8d26784cf0d04c1238e906efdd5de76439cb0a1e h: refs/heads/master i: 277593: 5ffd2ebdf1cb0544f875eeeeb7de7a83db37c921 277591: 9eeac57ba41b53b9f20d0b67470a1fd4093bf027 v: v3 --- [refs] | 2 +- trunk/net/ipv6/ip6_fib.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 815aacfcfa24..58b7375dbe99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14df015bb1708cd7ba1e5af11a1b0365b165a3ef +refs/heads/master: 8d26784cf0d04c1238e906efdd5de76439cb0a1e diff --git a/trunk/net/ipv6/ip6_fib.c b/trunk/net/ipv6/ip6_fib.c index e7b26dccd2d3..424f063fb229 100644 --- a/trunk/net/ipv6/ip6_fib.c +++ b/trunk/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 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, 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),