diff options
| author | Harvey Harrison <[email protected]> | 2008-05-02 23:44:07 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2008-05-02 23:44:07 +0000 |
| commit | 84994e16f25dabe234be4fc2d323ec9db95b87cb (patch) | |
| tree | d30cc0144afe0f4640e432b4c0bd4a0f1f86c9ed /net/dccp/ccids/ccid2.c | |
| parent | net: remove NR_CPUS arrays in net/core/dev.c (diff) | |
| download | kernel-84994e16f25dabe234be4fc2d323ec9db95b87cb.tar.gz kernel-84994e16f25dabe234be4fc2d323ec9db95b87cb.zip | |
dccp: ccid2.c, ccid3.c use clamp(), clamp_t()
Makes the intention of the nested min/max clear.
Signed-off-by: Harvey Harrison <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/dccp/ccids/ccid2.c')
| -rw-r--r-- | net/dccp/ccids/ccid2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index b5b52ebb2693..8e9580874216 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c @@ -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); |