1 files changed, 5 insertions, 3 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 540b7d92cc70..a4d214c7b506 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2391,7 +2391,7 @@ repair:
 
                 /* Send one loss probe per tail loss episode. */
                 if (push_one != 2)
-                        tcp_schedule_loss_probe(sk);
+                        tcp_schedule_loss_probe(sk, false);
                 is_cwnd_limited |= (tcp_packets_in_flight(tp) >= tp->snd_cwnd);
                 tcp_cwnd_validate(sk, is_cwnd_limited);
                 return false;
@@ -2399,7 +2399,7 @@ repair:
         return !tp->packets_out && !tcp_write_queue_empty(sk);
 }
 
-bool tcp_schedule_loss_probe(struct sock *sk)
+bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto)
 {
         struct inet_connection_sock *icsk = inet_csk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
@@ -2440,7 +2440,9 @@ bool tcp_schedule_loss_probe(struct sock *sk)
         }
 
         /* If the RTO formula yields an earlier time, then use that time. */
-        rto_delta_us = tcp_rto_delta_us(sk);  /* How far in future is RTO? */
+        rto_delta_us = advancing_rto ?
+                        jiffies_to_usecs(inet_csk(sk)->icsk_rto) :
+                        tcp_rto_delta_us(sk);  /* How far in future is RTO? */
         if (rto_delta_us > 0)
                 timeout = min_t(u32, timeout, usecs_to_jiffies(rto_delta_us));