Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / net / dccp / ccids / ccid3.c

diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index e76f460af0ea03a2c634d9e18137789ece6fd047..cd61dea2eea16bd1511f9c42e5648fc069ea4184 100644 (file)
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -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);
 }