aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids/ccid2.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2007-10-04 17:41:55 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:54:34 -0400
commitee196c2186d24d82088c94962598470e5abc081f (patch)
tree18d6f4382ae847c9e6091de8f766eb2918f11a99 /net/dccp/ccids/ccid2.c
parent7d9e8931f93683e575679e41f188d3b465269f08 (diff)
[CCID2]: Remove redundant BUG_ON
This removes a test for `val < 1' which would only have been triggered when val < 0, due to a preceding test for 0. Fixed by using an unsigned type for cwnd (as in TCP) instead. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ccids/ccid2.c')
-rw-r--r--net/dccp/ccids/ccid2.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index 3e4fa6b6f251..5114a2d30bfd 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -179,16 +179,11 @@ static void ccid2_change_l_ack_ratio(struct sock *sk, int val)
179 dp->dccps_l_ack_ratio = val; 179 dp->dccps_l_ack_ratio = val;
180} 180}
181 181
182static void ccid2_change_cwnd(struct ccid2_hc_tx_sock *hctx, int val) 182static void ccid2_change_cwnd(struct ccid2_hc_tx_sock *hctx, u32 val)
183{ 183{
184 if (val == 0)
185 val = 1;
186
187 /* XXX do we need to change ack ratio? */ 184 /* XXX do we need to change ack ratio? */
188 ccid2_pr_debug("change cwnd to %d\n", val); 185 hctx->ccid2hctx_cwnd = val? : 1;
189 186 ccid2_pr_debug("changed cwnd to %u\n", hctx->ccid2hctx_cwnd);
190 BUG_ON(val < 1);
191 hctx->ccid2hctx_cwnd = val;
192} 187}
193 188
194static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val) 189static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val)