tcp: Increase the initial congestion window to 10.
Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Nandita Dukkipati <nanditad@google.com>
This commit is contained in:
parent
5ea74318c6
commit
442b9635c5
3 changed files with 13 additions and 10 deletions
|
@ -196,6 +196,9 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
|
||||||
/* TCP thin-stream limits */
|
/* TCP thin-stream limits */
|
||||||
#define TCP_THIN_LINEAR_RETRIES 6 /* After 6 linear retries, do exp. backoff */
|
#define TCP_THIN_LINEAR_RETRIES 6 /* After 6 linear retries, do exp. backoff */
|
||||||
|
|
||||||
|
/* TCP initial congestion window */
|
||||||
|
#define TCP_INIT_CWND 10
|
||||||
|
|
||||||
extern struct inet_timewait_death_row tcp_death_row;
|
extern struct inet_timewait_death_row tcp_death_row;
|
||||||
|
|
||||||
/* sysctl variables for tcp */
|
/* sysctl variables for tcp */
|
||||||
|
@ -799,15 +802,6 @@ static inline __u32 tcp_current_ssthresh(const struct sock *sk)
|
||||||
/* Use define here intentionally to get WARN_ON location shown at the caller */
|
/* Use define here intentionally to get WARN_ON location shown at the caller */
|
||||||
#define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out)
|
#define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out)
|
||||||
|
|
||||||
/*
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh);
|
extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh);
|
||||||
extern __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst);
|
extern __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst);
|
||||||
|
|
||||||
|
|
|
@ -583,6 +583,15 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
||||||
dccp_ackvec_parsed_cleanup(&hc->tx_av_chunks);
|
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)
|
static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
|
||||||
{
|
{
|
||||||
struct ccid2_hc_tx_sock *hc = ccid_priv(ccid);
|
struct ccid2_hc_tx_sock *hc = ccid_priv(ccid);
|
||||||
|
|
|
@ -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);
|
__u32 cwnd = (dst ? dst_metric(dst, RTAX_INITCWND) : 0);
|
||||||
|
|
||||||
if (!cwnd)
|
if (!cwnd)
|
||||||
cwnd = rfc3390_bytes_to_packets(tp->mss_cache);
|
cwnd = TCP_INIT_CWND;
|
||||||
return min_t(__u32, cwnd, tp->snd_cwnd_clamp);
|
return min_t(__u32, cwnd, tp->snd_cwnd_clamp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue