net: ipv6: Standardize prefixes for message logging

[mirror_ubuntu-artful-kernel.git] / net / ipv6 / af_inet6.c

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index bf8e14659e2d05feb80364be7ed23c708acd5da9..138d4986c327990d04314d4c900602e4cd8fab31 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -18,6 +18,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) "IPv6: " fmt
 
 #include <linux/module.h>
 #include <linux/capability.h>
@@ -612,13 +613,11 @@ out:
        return ret;
 
 out_permanent:
-       printk(KERN_ERR "Attempt to override permanent protocol %d.\n",
-              protocol);
+       pr_err("Attempt to override permanent protocol %d\n", protocol);
        goto out;
 
 out_illegal:
-       printk(KERN_ERR
-              "Ignoring attempt to register invalid socket type %d.\n",
+       pr_err("Ignoring attempt to register invalid socket type %d\n",
               p->type);
        goto out;
 }
@@ -628,8 +627,7 @@ void
 inet6_unregister_protosw(struct inet_protosw *p)
 {
        if (INET_PROTOSW_PERMANENT & p->flags) {
-               printk(KERN_ERR
-                      "Attempt to unregister permanent protocol %d.\n",
+               pr_err("Attempt to unregister permanent protocol %d\n",
                       p->protocol);
        } else {
                spin_lock_bh(&inetsw6_lock);
@@ -1067,9 +1065,7 @@ static int __init inet6_init(void)
                INIT_LIST_HEAD(r);
 
        if (disable_ipv6_mod) {
-               printk(KERN_INFO
-                      "IPv6: Loaded, but administratively disabled, "
-                      "reboot required to enable\n");
+               pr_info("Loaded, but administratively disabled, reboot required to enable\n");
                goto out;
        }