diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-02-02 17:05:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-02 20:48:47 -0800 |
| commit | 442b9635c569fef038d5367a7acd906db4677ae1 (patch) | |
| tree | c20d06ca161c70c0db61ed298eaf51102b67a38e /net | |
| parent | bna: use device model DMA API (diff) | |
| download | linux-dev-442b9635c569fef038d5367a7acd906db4677ae1.tar.xz linux-dev-442b9635c569fef038d5367a7acd906db4677ae1.zip | |
tcp: Increase the initial congestion window to 10.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Nandita Dukkipati <nanditad@google.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dccp/ccids/ccid2.c | 9 | ||||
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index e96d5e810039..fadecd20d75b 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c @@ -583,6 +583,15 @@ done: dccp_ackvec_parsed_cleanup(&hc->tx_av_chunks); } +/* + * Convert RFC 3390 larger initial window into an equivalent number of packets. + * This is based on the numbers specified in RFC 5681, 3.1. + */ +static inline u32 rfc3390_bytes_to_packets(const u32 smss) +{ + return smss <= 1095 ? 4 : (smss > 2190 ? 2 : 3); +} + static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk) { struct ccid2_hc_tx_sock *hc = ccid_priv(ccid); diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index eb7f82ebf4a3..2f692cefd3b0 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -817,7 +817,7 @@ __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst) __u32 cwnd = (dst ? dst_metric(dst, RTAX_INITCWND) : 0); if (!cwnd) - cwnd = rfc3390_bytes_to_packets(tp->mss_cache); + cwnd = TCP_INIT_CWND; return min_t(__u32, cwnd, tp->snd_cwnd_clamp); } |