lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv6: Use pr_warn() in ip6_fib.c

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2011-11-17 03:18:28 -05:00
parent 14df015bb1
commit 8d26784cf0
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/ipv6/ip6_fib.c
View File

@@ -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)) { !ipv6_prefix_equal(&key->addr, addr, fn->fn_bit)) {
if (!allow_create) { if (!allow_create) {
if (replace_required) { if (replace_required) {
printk(KERN_WARNING pr_warn("IPv6: Can't replace route, "
"IPv6: Can't replace route, no match found\n"); "no match found\n");
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
} }
printk(KERN_WARNING pr_warn("IPv6: NLM_F_CREATE should be set "
"IPv6: NLM_F_CREATE should be set when creating new route\n"); "when creating new route\n");
} }
goto insert_above; 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 * That would keep IPv6 consistent with IPv4
*/ */
if (replace_required) { if (replace_required) {
printk(KERN_WARNING pr_warn("IPv6: Can't replace route, no match found\n");
"IPv6: Can't replace route, no match found\n");
return ERR_PTR(-ENOENT); 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. * 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 (!replace) {
if (!add) 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: add:
rt->dst.rt6_next = iter; rt->dst.rt6_next = iter;
@@ -716,7 +716,7 @@ add:
if (!found) { if (!found) {
if (add) if (add)
goto 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; return -ENOENT;
} }
*ins = rt; *ins = rt;
@@ -768,7 +768,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
replace_required = 1; replace_required = 1;
} }
if (!allow_create && !replace_required) 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), fn = fib6_add_1(root, &rt->rt6i_dst.addr, sizeof(struct in6_addr),
rt->rt6i_dst.plen, offsetof(struct rt6_info, rt6i_dst), rt->rt6i_dst.plen, offsetof(struct rt6_info, rt6i_dst),