Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / ipv6 / ip6_fib.c

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 9371743..0c220a4 100644 (file)
--- 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>
@@ -38,7 +41,7 @@
 #define RT6_DEBUG 2
 
 #if RT6_DEBUG >= 3
-#define RT6_TRACE(x...) printk(KERN_DEBUG x)
+#define RT6_TRACE(x...) pr_debug(x)
 #else
 #define RT6_TRACE(x...) do { ; } while (0)
 #endif
@@ -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),
@@ -1420,7 +1420,8 @@ static int fib6_clean_node(struct fib6_walker_t *w)
                        res = fib6_del(rt, &info);
                        if (res) {
 #if RT6_DEBUG >= 2
-                               printk(KERN_DEBUG "fib6_clean_node: del failed: rt=%p@%p err=%d\n", rt, rt->rt6i_node, res);
+                               pr_debug("%s: del failed: rt=%p@%p err=%d\n",
+                                        __func__, rt, rt->rt6i_node, res);
 #endif
                                continue;
                        }