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

Commit 84994e16 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

dccp: ccid2.c, ccid3.c use clamp(), clamp_t() 



Makes the intention of the nested min/max clear.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c0b0aca

net/dccp/ccids/ccid2.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk) 
	 * packets for new connections, following the rules from [RFC3390]".

	 * We need to convert the bytes of RFC3390 into the packets of RFC 4341.

	 */

	hctx->ccid2hctx_cwnd = min(4U, max(2U, 4380U / dp->dccps_mss_cache));

	hctx->ccid2hctx_cwnd = clamp(4380U / dp->dccps_mss_cache, 2U, 4U);



	/* Make sure that Ack Ratio is enabled and within bounds. */

	max_ratio = DIV_ROUND_UP(hctx->ccid2hctx_cwnd, 2);

net/dccp/ccids/ccid3.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static void ccid3_hc_tx_set_state(struct sock *sk, 
static inline u64 rfc3390_initial_rate(struct sock *sk)

{

	const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);

	const __u32 w_init = min_t(__u32, 4 * hctx->ccid3hctx_s,

				   max_t(__u32, 2 * hctx->ccid3hctx_s, 4380));

	const __u32 w_init = clamp_t(__u32, 4380U,

			2 * hctx->ccid3hctx_s, 4 * hctx->ccid3hctx_s);



	return scaled_div(w_init << 6, hctx->ccid3hctx_rtt);

}