Merge "tcp: retry more conservatively on local congestion" (5780911a) · Commits · e / devices / android_kernel_fairphone_FP3

net/ipv4/tcp_timer.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -536,14 +536,13 @@ void tcp_retransmit_timer(struct sock *sk)

		tcp_enter_loss(sk);

		icsk->icsk_retransmits++;
		if (tcp_retransmit_skb(sk, tcp_write_queue_head(sk), 1) > 0) {
		/* Retransmission failed because of local congestion,
		* do not backoff.
		* Let senders fight for local resources conservatively.
		*/
		if (!icsk->icsk_retransmits)
		icsk->icsk_retransmits = 1;
		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
		min(icsk->icsk_rto, TCP_RESOURCE_PROBE_INTERVAL),
		TCP_RESOURCE_PROBE_INTERVAL,
		TCP_RTO_MAX);
		goto out;
		}
		@@ -564,7 +563,6 @@ void tcp_retransmit_timer(struct sock *sk)
		* the 120 second clamps though!
		*/
		icsk->icsk_backoff++;
		icsk->icsk_retransmits++;

		out_reset_timer:
		/* If stream is thin, use linear timeouts. Since 'icsk_backoff' is