diff options
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 593960d66ed9..0ead46f2bcd5 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2424,8 +2424,7 @@ static void tcp_cong_avoid(struct sock *sk, u32 ack, | |||
2424 | /* Restart timer after forward progress on connection. | 2424 | /* Restart timer after forward progress on connection. |
2425 | * RFC2988 recommends to restart timer to now+rto. | 2425 | * RFC2988 recommends to restart timer to now+rto. |
2426 | */ | 2426 | */ |
2427 | 2427 | static void tcp_rearm_rto(struct sock *sk) | |
2428 | static void tcp_ack_packets_out(struct sock *sk) | ||
2429 | { | 2428 | { |
2430 | struct tcp_sock *tp = tcp_sk(sk); | 2429 | struct tcp_sock *tp = tcp_sk(sk); |
2431 | 2430 | ||
@@ -2581,7 +2580,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p) | |||
2581 | = inet_csk(sk)->icsk_ca_ops; | 2580 | = inet_csk(sk)->icsk_ca_ops; |
2582 | 2581 | ||
2583 | tcp_ack_update_rtt(sk, acked, seq_rtt); | 2582 | tcp_ack_update_rtt(sk, acked, seq_rtt); |
2584 | tcp_ack_packets_out(sk); | 2583 | tcp_rearm_rto(sk); |
2585 | 2584 | ||
2586 | if (tcp_is_reno(tp)) | 2585 | if (tcp_is_reno(tp)) |
2587 | tcp_remove_reno_sacks(sk, pkts_acked); | 2586 | tcp_remove_reno_sacks(sk, pkts_acked); |