OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Gerrit Renker 2007-10-04 14:41:55 -07:00 committed by David S. Miller
parent 7d9e8931f9
commit ee196c2186
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/dccp/ccids/ccid2.c
View File

@ -179,16 +179,11 @@ static void ccid2_change_l_ack_ratio(struct sock *sk, int val)
dp->dccps_l_ack_ratio = 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? */ /* XXX do we need to change ack ratio? */
ccid2_pr_debug("change cwnd to %d\n", val); hctx->ccid2hctx_cwnd = val? : 1;
ccid2_pr_debug("changed cwnd to %u\n", hctx->ccid2hctx_cwnd);
BUG_ON(val < 1);
hctx->ccid2hctx_cwnd = val;
} }
static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val) static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val)

2
net/dccp/ccids/ccid2.h
View File

@ -50,7 +50,7 @@ struct ccid2_seq {
* @ccid2hctx_rpdupack - dupacks since rpseq * @ccid2hctx_rpdupack - dupacks since rpseq
*/ */
struct ccid2_hc_tx_sock { struct ccid2_hc_tx_sock {
int ccid2hctx_cwnd; u32 ccid2hctx_cwnd;
int ccid2hctx_ssacks; int ccid2hctx_ssacks;
int ccid2hctx_acks; int ccid2hctx_acks;
unsigned int ccid2hctx_ssthresh; unsigned int ccid2hctx_ssthresh;