aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2007-03-20 13:28:44 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:26:49 -0400
commit371fe7779cad6557a58df9a1b5543652e067400f (patch)
tree037be0b166906ff91f2b4a7c7d11a01180a0db61 /net/dccp
parent9bf17475eb658a920125bd8f05edf9c57c2dd950 (diff)
[CCID3]: Use MSS for larger initial windows
This improves the slow-start phase by using the MSS (as suggested in RFC 4342, sec. 5) instead of the packet size s. Also figured out that __u32 is ample resource enough. After applying, I got the following in the logs: ccid3_hc_tx_packet_recv: client(f7421700), s=6, MSS=1424, w_init=4380, R_sample=176us, X=24886363 Had the previous variant been used, w_init would have been as low as 24. Committer note: removed unneeded cast to unsigned long long that was causing a compiler warning on 64bit architectures. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ccids/ccid3.c10
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