diff --git a/[refs] b/[refs]
index 06e4878ecde1..8a8a7fd3b1f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1b4b9f3986b80d5785d91dbd8d72cfaf9fd1117
+refs/heads/master: 832e3ca62d6ee1893db05f5202c24ae5331e19ba
diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c
index fa6b75372ed7..40402c59506a 100644
--- a/trunk/net/dccp/ccids/ccid3.c
+++ b/trunk/net/dccp/ccids/ccid3.c
@@ -845,8 +845,8 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk)
 	 * 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 +858,7 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk)
 		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;
 		}
 	}