From 27e53eaea2a6d737c24f2f3d98b73d1a0e07c086 Mon Sep 17 00:00:00 2001
From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Thu, 4 Oct 2007 14:41:55 -0700
Subject: [PATCH] --- yaml --- r: 66916 b: refs/heads/master c:
 ee196c2186d24d82088c94962598470e5abc081f h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/net/dccp/ccids/ccid2.c | 11 +++--------
 trunk/net/dccp/ccids/ccid2.h |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7859db4781de..f5eb06c69664 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d9e8931f93683e575679e41f188d3b465269f08
+refs/heads/master: ee196c2186d24d82088c94962598470e5abc081f
diff --git a/trunk/net/dccp/ccids/ccid2.c b/trunk/net/dccp/ccids/ccid2.c
index 3e4fa6b6f251..5114a2d30bfd 100644
--- a/trunk/net/dccp/ccids/ccid2.c
+++ b/trunk/net/dccp/ccids/ccid2.c
@@ -179,16 +179,11 @@ static void ccid2_change_l_ack_ratio(struct sock *sk, int val)
 	dp->dccps_l_ack_ratio = val;
 }
 
-static void ccid2_change_cwnd(struct ccid2_hc_tx_sock *hctx, int val)
+static void ccid2_change_cwnd(struct ccid2_hc_tx_sock *hctx, u32 val)
 {
-	if (val == 0)
-		val = 1;
-
 	/* XXX do we need to change ack ratio? */
-	ccid2_pr_debug("change cwnd to %d\n", val);
-
-	BUG_ON(val < 1);
-	hctx->ccid2hctx_cwnd = val;
+	hctx->ccid2hctx_cwnd = val? : 1;
+	ccid2_pr_debug("changed cwnd to %u\n", hctx->ccid2hctx_cwnd);
 }
 
 static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val)
diff --git a/trunk/net/dccp/ccids/ccid2.h b/trunk/net/dccp/ccids/ccid2.h
index ebd79499c85a..d9daa534c9be 100644
--- a/trunk/net/dccp/ccids/ccid2.h
+++ b/trunk/net/dccp/ccids/ccid2.h
@@ -50,7 +50,7 @@ struct ccid2_seq {
  * @ccid2hctx_rpdupack - dupacks since rpseq
 */
 struct ccid2_hc_tx_sock {
-	int			ccid2hctx_cwnd;
+	u32			ccid2hctx_cwnd;
 	int			ccid2hctx_ssacks;
 	int			ccid2hctx_acks;
 	unsigned int		ccid2hctx_ssthresh;