---

yaml
---
r: 44287
b: refs/heads/master
c: 1fba78b
h: refs/heads/master
i:
  44285: 5102549
  44283: bd2c91e
  44279: fea6342
  44271: de387d9
  44255: 6819e05
  44223: aaa6438
  44159: ee8aaf5
  44031: 1bdd551
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e8efc824098c241a1cde81f5558d222cb6f9369
+refs/heads/master: 1fba78b6cba14bd37fdb12c5367f1e4d58ff2e0f

trunk/net/dccp/ccids/ccid3.c

@@ -399,7 +399,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
 	struct timeval now;
 	unsigned long t_nfb;
 	u32 pinv;
-	long r_sample, t_elapsed;
+	suseconds_t r_sample, t_elapsed;
 
 	BUG_ON(hctx == NULL);
 
@@ -446,8 +446,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
 
 		DCCP_BUG_ON(r_sample < 0);
 		if (unlikely(r_sample <= t_elapsed))
-			DCCP_WARN("WARNING: r_sample=%ldus <= t_elapsed=%ldus\n",
-				  r_sample, t_elapsed);
+			DCCP_WARN("WARNING: r_sample=%dus <= t_elapsed=%dus\n",
+				  (int)r_sample, (int)t_elapsed);
 		else
 			r_sample -= t_elapsed;
 		CCID3_RTT_SANITY_CHECK(r_sample);
@@ -474,8 +474,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
 			ccid3_update_send_time(hctx);
 
 			ccid3_pr_debug("%s(%p), s=%u, w_init=%llu, "
-				       "R_sample=%ldus, X=%u\n", dccp_role(sk),
-				       sk, hctx->ccid3hctx_s, w_init, r_sample,
+				       "R_sample=%dus, X=%u\n", dccp_role(sk),
+				       sk, hctx->ccid3hctx_s, w_init, (int)r_sample,
 				       (unsigned)(hctx->ccid3hctx_x >> 6));
 
 			ccid3_hc_tx_set_state(sk, TFRC_SSTATE_FBACK);
@@ -491,9 +491,9 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
 						    hctx->ccid3hctx_p);
 			ccid3_hc_tx_update_x(sk, &now);
 
-			ccid3_pr_debug("%s(%p), RTT=%uus (sample=%ldus), s=%u, "
+			ccid3_pr_debug("%s(%p), RTT=%uus (sample=%dus), s=%u, "
 				       "p=%u, X_calc=%u, X_recv=%u, X=%u\n", dccp_role(sk),
-				       sk, hctx->ccid3hctx_rtt, r_sample,
+				       sk, hctx->ccid3hctx_rtt, (int)r_sample,
 				       hctx->ccid3hctx_s, hctx->ccid3hctx_p,
 				       hctx->ccid3hctx_x_calc,
 				       (unsigned)(hctx->ccid3hctx_x_recv >> 6),
@@ -821,8 +821,8 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk)
 	DCCP_BUG_ON(delta < 0);
 
 	rtt = delta * 4 / interval;
-	ccid3_pr_debug("%s(%p), approximated RTT to %ldus\n",
-		       dccp_role(sk), sk, rtt);
+	ccid3_pr_debug("%s(%p), approximated RTT to %dus\n",
+		       dccp_role(sk), sk, (int)rtt);
 
 	/*
 	 * Determine the length of the first loss interval via inverse lookup.

trunk/net/dccp/ccids/ccid3.h

@@ -52,12 +52,12 @@
 #define TFRC_T_MBI		   64
 
 /* What we think is a reasonable upper limit on RTT values */
-#define CCID3_SANE_RTT_MAX	   (4 * USEC_PER_SEC)
+#define CCID3_SANE_RTT_MAX	   ((suseconds_t)(4 * USEC_PER_SEC))
 
 #define CCID3_RTT_SANITY_CHECK(rtt) 			do {		   \
 		if (rtt > CCID3_SANE_RTT_MAX) {				   \
-			DCCP_CRIT("RTT (%ld) too large, substituting %ld", \
-				  rtt, CCID3_SANE_RTT_MAX);		   \
+			DCCP_CRIT("RTT (%d) too large, substituting %d",   \
+				  (int)rtt, (int)CCID3_SANE_RTT_MAX);	   \
 			rtt = CCID3_SANE_RTT_MAX;			   \
 		} 					} while (0)