]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[DCCP]: Warning fixes.
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 6 Feb 2007 02:18:21 +0000 (18:18 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 8 Feb 2007 20:38:56 +0000 (12:38 -0800)
net/dccp/ccids/ccid3.c: In function `ccid3_hc_rx_packet_recv':
net/dccp/ccids/ccid3.c:1007: warning: long int format, different type arg (arg 3)
net/dccp/ccids/ccid3.c:1007: warning: long int format, different type arg (arg 4)

opaque types must be suitably cast for printing.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dccp/ccids/ccid3.c

index 40402c59506a32b5b5c12d3bc7ca53730d087740..5c452a3ec4d1521ee60f159735693909c918c27c 100644 (file)
@@ -479,7 +479,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
 
                        ccid3_pr_debug("%s(%p), s=%u, w_init=%llu, "
                                       "R_sample=%dus, X=%u\n", dccp_role(sk),
-                                      sk, hctx->ccid3hctx_s, w_init,
+                                      sk, hctx->ccid3hctx_s,
+                                      (unsigned long long)w_init,
                                       (int)r_sample,
                                       (unsigned)(hctx->ccid3hctx_x >> 6));
 
@@ -1005,7 +1006,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
                DCCP_BUG_ON(r_sample < 0);
                if (unlikely(r_sample <= t_elapsed))
                        DCCP_WARN("r_sample=%ldus, t_elapsed=%ldus\n",
-                                 r_sample, t_elapsed);
+                                 (long)r_sample, (long)t_elapsed);
                else
                        r_sample -= t_elapsed;
                CCID3_RTT_SANITY_CHECK(r_sample);