Skip to content

Commit

Permalink
[CCID2]: Remove redundant BUG_ON
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gerrit Renker authored and David S. Miller committed Oct 10, 2007
1 parent 7d9e893 commit ee196c2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
11 changes: 3 additions & 8 deletions net/dccp/ccids/ccid2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion net/dccp/ccids/ccid2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ee196c2

Please sign in to comment.