aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-02-05 21:18:21 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-08 15:38:56 -0500
commit0f08461ebf89e10f7db9042fb028359b810c3c81 (patch)
tree3a8bdeebfd307483d3a6ab094a770449112b4135 /net
parent919afbd68863550665b328a78107bc2919c5e3f4 (diff)
[DCCP]: Warning fixes.
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>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/ccids/ccid3.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 40402c59506a..5c452a3ec4d1 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -479,7 +479,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
479 479
480 ccid3_pr_debug("%s(%p), s=%u, w_init=%llu, " 480 ccid3_pr_debug("%s(%p), s=%u, w_init=%llu, "
481 "R_sample=%dus, X=%u\n", dccp_role(sk), 481 "R_sample=%dus, X=%u\n", dccp_role(sk),
482 sk, hctx->ccid3hctx_s, w_init, 482 sk, hctx->ccid3hctx_s,
483 (unsigned long long)w_init,
483 (int)r_sample, 484 (int)r_sample,
484 (unsigned)(hctx->ccid3hctx_x >> 6)); 485 (unsigned)(hctx->ccid3hctx_x >> 6));
485 486
@@ -1005,7 +1006,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
1005 DCCP_BUG_ON(r_sample < 0); 1006 DCCP_BUG_ON(r_sample < 0);
1006 if (unlikely(r_sample <= t_elapsed)) 1007 if (unlikely(r_sample <= t_elapsed))
1007 DCCP_WARN("r_sample=%ldus, t_elapsed=%ldus\n", 1008 DCCP_WARN("r_sample=%ldus, t_elapsed=%ldus\n",
1008 r_sample, t_elapsed); 1009 (long)r_sample, (long)t_elapsed);
1009 else 1010 else
1010 r_sample -= t_elapsed; 1011 r_sample -= t_elapsed;
1011 CCID3_RTT_SANITY_CHECK(r_sample); 1012 CCID3_RTT_SANITY_CHECK(r_sample);