Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/dccp/ccids/ccid2.c
View file

@ -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]". * packets for new connections, following the rules from [RFC3390]".
* We need to convert the bytes of RFC3390 into the packets of RFC 4341. * 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. */ /* Make sure that Ack Ratio is enabled and within bounds. */
max_ratio = DIV_ROUND_UP(hctx->ccid2hctx_cwnd, 2); max_ratio = DIV_ROUND_UP(hctx->ccid2hctx_cwnd, 2);

4
net/dccp/ccids/ccid3.c
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) static inline u64 rfc3390_initial_rate(struct sock *sk)
{ {
const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk); const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
const __u32 w_init = min_t(__u32, 4 * hctx->ccid3hctx_s, const __u32 w_init = clamp_t(__u32, 4380U,
max_t(__u32, 2 * hctx->ccid3hctx_s, 4380)); 2 * hctx->ccid3hctx_s, 4 * hctx->ccid3hctx_s);
return scaled_div(w_init << 6, hctx->ccid3hctx_rtt); return scaled_div(w_init << 6, hctx->ccid3hctx_rtt);
} }