Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / dccp / probe.c

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 9ca783d74678e80c39820d79f7bd129f0a0788ce..37731da4148164adc741da891a86b27e2484187d 100644 (file)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -83,18 +83,18 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
        if (port == 0 || ntohs(inet->dport) == port ||
            ntohs(inet->sport) == port) {
                if (hctx)
-                       printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d %d %d %d %u "
+                       printl("%pI4:%u %pI4:%u %d %d %d %d %u "
                               "%llu %llu %d\n",
-                              NIPQUAD(inet->saddr), ntohs(inet->sport),
-                              NIPQUAD(inet->daddr), ntohs(inet->dport), size,
+                              &inet->saddr, ntohs(inet->sport),
+                              &inet->daddr, ntohs(inet->dport), size,
                               hctx->ccid3hctx_s, hctx->ccid3hctx_rtt,
                               hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc,
                               hctx->ccid3hctx_x_recv >> 6,
                               hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi);
                else
-                       printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d\n",
-                              NIPQUAD(inet->saddr), ntohs(inet->sport),
-                              NIPQUAD(inet->daddr), ntohs(inet->dport), size);
+                       printl("%pI4:%u %pI4:%u %d\n",
+                              &inet->saddr, ntohs(inet->sport),
+                              &inet->daddr, ntohs(inet->dport), size);
        }
 
        jprobe_return();