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

[cascardo/linux.git] / net / ipv4 / fib_frontend.c

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 92fc5f6..76e72ba 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -695,7 +695,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)
        if (ifa->ifa_flags & IFA_F_SECONDARY) {
                prim = inet_ifa_byprefix(in_dev, prefix, mask);
                if (prim == NULL) {
-                       printk(KERN_WARNING "fib_add_ifaddr: bug: prim == NULL\n");
+                       pr_warn("%s: bug: prim == NULL\n", __func__);
                        return;
                }
        }
@@ -749,11 +749,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)
        if (ifa->ifa_flags & IFA_F_SECONDARY) {
                prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);
                if (prim == NULL) {
-                       printk(KERN_WARNING "fib_del_ifaddr: bug: prim == NULL\n");
+                       pr_warn("%s: bug: prim == NULL\n", __func__);
                        return;
                }
                if (iprim && iprim != prim) {
-                       printk(KERN_WARNING "fib_del_ifaddr: bug: iprim != prim\n");
+                       pr_warn("%s: bug: iprim != prim\n", __func__);
                        return;
                }
        } else if (!ipv4_is_zeronet(any) &&