aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
authorYuchung Cheng <ycheng@google.com>2017-11-08 16:01:26 -0500
committerDavid S. Miller <davem@davemloft.net>2017-11-11 04:53:16 -0500
commit713bafea92920103cd3d361657406cf04d0e22dd (patch)
tree505a887887bb48dc443388b0078ad176ff6edb5b /net/ipv4/tcp_output.c
parente4ec1384132ead18e972f1180e958aa0b69abd11 (diff)
tcp: retire FACK loss detection
FACK loss detection has been disabled by default and the successor RACK subsumed FACK and can handle reordering better. This patch removes FACK to simplify TCP loss recovery. Signed-off-by: Yuchung Cheng <ycheng@google.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Neal Cardwell <ncardwell@google.com> Reviewed-by: Soheil Hassas Yeganeh <soheil@google.com> Reviewed-by: Priyaranjan Jha <priyarjha@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 9b98d35aa0d8..094c429b4401 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1257,7 +1257,7 @@ static void tcp_adjust_pcount(struct sock *sk, const struct sk_buff *skb, int de
1257 1257
1258 if (tp->lost_skb_hint && 1258 if (tp->lost_skb_hint &&
1259 before(TCP_SKB_CB(skb)->seq, TCP_SKB_CB(tp->lost_skb_hint)->seq) && 1259 before(TCP_SKB_CB(skb)->seq, TCP_SKB_CB(tp->lost_skb_hint)->seq) &&
1260 (tcp_is_fack(tp) || (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED))) 1260 (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED))
1261 tp->lost_cnt_hint -= decr; 1261 tp->lost_cnt_hint -= decr;
1262 1262
1263 tcp_verify_left_out(tp); 1263 tcp_verify_left_out(tp);
@@ -2961,9 +2961,6 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
2961 * retransmitted data is acknowledged. It tries to continue 2961 * retransmitted data is acknowledged. It tries to continue
2962 * resending the rest of the retransmit queue, until either 2962 * resending the rest of the retransmit queue, until either
2963 * we've sent it all or the congestion window limit is reached. 2963 * we've sent it all or the congestion window limit is reached.
2964 * If doing SACK, the first ACK which comes back for a timeout
2965 * based retransmit packet might feed us FACK information again.
2966 * If so, we use it to avoid unnecessarily retransmissions.
2967 */ 2964 */
2968void tcp_xmit_retransmit_queue(struct sock *sk) 2965void tcp_xmit_retransmit_queue(struct sock *sk)
2969{ 2966{