diff options
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 93717435013..e9846da7742 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -18,6 +18,9 @@   * 				routing table.   * 	Ville Nuorvala:		Fixed routing subtrees.   */ + +#define pr_fmt(fmt) "IPv6: " fmt +  #include <linux/errno.h>  #include <linux/types.h>  #include <linux/net.h> @@ -451,12 +454,10 @@ 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) { -					pr_warn("IPv6: Can't replace route, " -						"no match found\n"); +					pr_warn("Can't replace route, no match found\n");  					return ERR_PTR(-ENOENT);  				} -				pr_warn("IPv6: NLM_F_CREATE should be set " -					"when creating new route\n"); +				pr_warn("NLM_F_CREATE should be set when creating new route\n");  			}  			goto insert_above;  		} @@ -499,11 +500,10 @@ static struct fib6_node * fib6_add_1(struct fib6_node *root, void *addr,  		 * That would keep IPv6 consistent with IPv4  		 */  		if (replace_required) { -			pr_warn("IPv6: Can't replace route, no match found\n"); +			pr_warn("Can't replace route, no match found\n");  			return ERR_PTR(-ENOENT);  		} -		pr_warn("IPv6: NLM_F_CREATE should be set " -			"when creating new route\n"); +		pr_warn("NLM_F_CREATE should be set when creating new route\n");  	}  	/*  	 *	We walked to the bottom of tree. @@ -696,7 +696,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,  	 */  	if (!replace) {  		if (!add) -			pr_warn("IPv6: NLM_F_CREATE should be set when creating new route\n"); +			pr_warn("NLM_F_CREATE should be set when creating new route\n");  add:  		rt->dst.rt6_next = iter; @@ -715,7 +715,7 @@ add:  		if (!found) {  			if (add)  				goto add; -			pr_warn("IPv6: NLM_F_REPLACE set, but no existing node found!\n"); +			pr_warn("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) -		pr_warn("IPv6: RTM_NEWROUTE with no NLM_F_CREATE or NLM_F_REPLACE\n"); +		pr_warn("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),  |