1 files changed, 9 insertions, 6 deletions

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index bba658d9a03c..5cb75bfe45b1 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -30,6 +30,9 @@
  *  The decompression of IP datagram MUST be done after the reassembly,
  *  AH/ESP processing.
  */
+
+#define pr_fmt(fmt) "IPv6: " fmt
+
 #include <linux/module.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
@@ -69,8 +72,8 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         if (!x)
                 return;
 
-        printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/%pI6\n",
-                        spi, &iph->daddr);
+        pr_debug("pmtu discovery on SA IPCOMP/%08x/%pI6\n",
+                 spi, &iph->daddr);
         xfrm_state_put(x);
 }
 
@@ -190,11 +193,11 @@ static const struct inet6_protocol ipcomp6_protocol =
 static int __init ipcomp6_init(void)
 {
         if (xfrm_register_type(&ipcomp6_type, AF_INET6) < 0) {
-                printk(KERN_INFO "ipcomp6 init: can't add xfrm type\n");
+                pr_info("%s: can't add xfrm type\n", __func__);
                 return -EAGAIN;
         }
         if (inet6_add_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0) {
-                printk(KERN_INFO "ipcomp6 init: can't add protocol\n");
+                pr_info("%s: can't add protocol\n", __func__);
                 xfrm_unregister_type(&ipcomp6_type, AF_INET6);
                 return -EAGAIN;
         }
@@ -204,9 +207,9 @@ static int __init ipcomp6_init(void)
 static void __exit ipcomp6_fini(void)
 {
         if (inet6_del_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0)
-                printk(KERN_INFO "ipv6 ipcomp close: can't remove protocol\n");
+                pr_info("%s: can't remove protocol\n", __func__);
         if (xfrm_unregister_type(&ipcomp6_type, AF_INET6) < 0)
-                printk(KERN_INFO "ipv6 ipcomp close: can't remove xfrm type\n");
+                pr_info("%s: can't remove xfrm type\n", __func__);
 }
 
 module_init(ipcomp6_init);