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

Makes the intention of the nested min/max clear.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harvey Harrison
2008-05-02 16:44:07 -07:00
committed by David S. Miller
parent 0c0b0aca66
commit 84994e16f2
2 changed files with 3 additions and 3 deletions

View File

@ -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);
}