From: Ian McDonald <ian.mcdonald@jandi.co.nz>
Date: Tue, 12 Dec 2006 02:47:59 +0000 (-0200)
Subject: [DCCP] ccid3: return value in ccid3_hc_rx_calc_first_li
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=832e3ca62d6ee1893db05f5202c24ae5331e19ba;p=openwrt%2Fstaging%2Fblogic.git

[DCCP] ccid3: return value in ccid3_hc_rx_calc_first_li

In a recent patch we introduced invalid return codes which will result in the
opposite of what is intended (i.e. send more packets in face of peculiar
network conditions).

This fixes it by returning ~0 which means not calculated as per
dccp_li_hist_calc_i_mean.

Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
---

diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index fa6b75372ed7..40402c59506a 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -845,8 +845,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 +858,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;
 		}
 	}