OMAP3 clock: Fixed processing of bootarg 'mpurate'

[safe/jmp/linux-2.6] / net / dccp / probe.c

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index a87fd4f..37731da 100644 (file)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -83,16 +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,
-                              hctx->s, hctx->rtt, hctx->p, hctx->x_calc,
-                              hctx->x_recv >> 6, hctx->x >> 6, hctx->t_ipi);
+                              &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();