diff options
Diffstat (limited to 'net/dccp/ccids/ccid3.c')
-rw-r--r-- | net/dccp/ccids/ccid3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index 0009b399d146..52dae40bdffb 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
@@ -466,20 +466,20 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
466 | if (hctx->ccid3hctx_state == TFRC_SSTATE_NO_FBACK) { | 466 | if (hctx->ccid3hctx_state == TFRC_SSTATE_NO_FBACK) { |
467 | /* | 467 | /* |
468 | * Larger Initial Windows [RFC 4342, sec. 5] | 468 | * Larger Initial Windows [RFC 4342, sec. 5] |
469 | * We deviate in that we use `s' instead of `MSS'. | ||
470 | */ | 469 | */ |
471 | __u64 w_init = min(4 * hctx->ccid3hctx_s, | 470 | __u32 w_init = min(4 * dp->dccps_mss_cache, |
472 | max(2 * hctx->ccid3hctx_s, 4380)); | 471 | max(2 * dp->dccps_mss_cache, 4380U)); |
473 | hctx->ccid3hctx_rtt = r_sample; | 472 | hctx->ccid3hctx_rtt = r_sample; |
474 | hctx->ccid3hctx_x = scaled_div(w_init << 6, r_sample); | 473 | hctx->ccid3hctx_x = scaled_div(w_init << 6, r_sample); |
475 | hctx->ccid3hctx_t_ld = now; | 474 | hctx->ccid3hctx_t_ld = now; |
476 | 475 | ||
477 | ccid3_update_send_time(hctx); | 476 | ccid3_update_send_time(hctx); |
478 | 477 | ||
479 | ccid3_pr_debug("%s(%p), s=%u, w_init=%llu, " | 478 | ccid3_pr_debug("%s(%p), s=%u, MSS=%u, w_init=%u, " |
480 | "R_sample=%dus, X=%u\n", dccp_role(sk), | 479 | "R_sample=%dus, X=%u\n", dccp_role(sk), |
481 | sk, hctx->ccid3hctx_s, | 480 | sk, hctx->ccid3hctx_s, |
482 | (unsigned long long)w_init, | 481 | dp->dccps_mss_cache, |
482 | w_init, | ||
483 | (int)r_sample, | 483 | (int)r_sample, |
484 | (unsigned)(hctx->ccid3hctx_x >> 6)); | 484 | (unsigned)(hctx->ccid3hctx_x >> 6)); |
485 | 485 | ||