Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[karo-tx-linux.git] / net / netfilter / ipvs / ip_vs_proto_ah_esp.c

diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
index 59f2d11b683e2572f8e4d4c7ca8693c4f9253933..c30b43c36cd7185569ef95354ccd552cc2600aee 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
@@ -10,6 +10,9 @@
  *
  */
 
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/module.h>
@@ -135,11 +138,10 @@ ah_esp_debug_packet_v4(struct ip_vs_protocol *pp, const struct sk_buff *skb,
        if (ih == NULL)
                sprintf(buf, "%s TRUNCATED", pp->name);
        else
-               sprintf(buf, "%s %u.%u.%u.%u->%u.%u.%u.%u",
-                       pp->name, NIPQUAD(ih->saddr),
-                       NIPQUAD(ih->daddr));
+               sprintf(buf, "%s %pI4->%pI4",
+                       pp->name, &ih->saddr, &ih->daddr);
 
-       printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
+       pr_debug("%s: %s\n", msg, buf);
 }
 
 #ifdef CONFIG_IP_VS_IPV6
@@ -154,10 +156,10 @@ ah_esp_debug_packet_v6(struct ip_vs_protocol *pp, const struct sk_buff *skb,
        if (ih == NULL)
                sprintf(buf, "%s TRUNCATED", pp->name);
        else
-               sprintf(buf, "%s %p6->%p6",
+               sprintf(buf, "%s %pI6->%pI6",
                        pp->name, &ih->saddr, &ih->daddr);
 
-       printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
+       pr_debug("%s: %s\n", msg, buf);
 }
 #endif