Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee196c21 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[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: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d9e8931

net/dccp/ccids/ccid2.c

+3 −8
Original line number Diff line number Diff line
@@ -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)

net/dccp/ccids/ccid2.h

+1 −1
Original line number Diff line number Diff line
@@ -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;