Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 442b9635 authored by David S. Miller's avatar David S. Miller
Browse files

tcp: Increase the initial congestion window to 10. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarNandita Dukkipati <nanditad@google.com>
parent 5ea74318

include/net/tcp.h

+3 −9
Original line number Original line Diff line number Diff line
@@ -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);

net/dccp/ccids/ccid2.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -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);

net/ipv4/tcp_input.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

}

}