Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm

[sfrench/cifs-2.6.git] / net / dccp / ccids / ccid3.c

diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index fa6b75372ed701d114ea7f9b9c8596ee5f34f97e..5c452a3ec4d1521ee60f159735693909c918c27c 100644 (file)
--- 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)
 
                        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));
 
@@ -845,8 +846,8 @@ found:
         * Find some p such that f(p) = fval; return 1/p [RFC 3448, 6.3.1].
         */
        if (rtt == 0) {                 /* would result in divide-by-zero */
-               DCCP_WARN("RTT==0, returning 1/p = 1\n");
-               return 1000000;
+               DCCP_WARN("RTT==0\n");
+               return ~0;
        }
 
        dccp_timestamp(sk, &tstamp);
@@ -858,7 +859,7 @@ found:
                DCCP_WARN("X_recv==0\n");
                if ((x_recv = hcrx->ccid3hcrx_x_recv) == 0) {
                        DCCP_BUG("stored value of X_recv is zero");
-                       return 1000000;
+                       return ~0;
                }
        }
 
@@ -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);