1 files changed, 11 insertions, 2 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index cb95c7a9d1e7..5f4fb4d5bbd6 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1752,9 +1752,11 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,
 static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
                                  bool *is_cwnd_limited, u32 max_segs)
 {
-        struct tcp_sock *tp = tcp_sk(sk);
         const struct inet_connection_sock *icsk = inet_csk(sk);
-        u32 send_win, cong_win, limit, in_flight;
+        u32 age, send_win, cong_win, limit, in_flight;
+        struct tcp_sock *tp = tcp_sk(sk);
+        struct skb_mstamp now;
+        struct sk_buff *head;
         int win_divisor;
 
         if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
@@ -1808,6 +1810,13 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
                         goto send_now;
         }
 
+        head = tcp_write_queue_head(sk);
+        skb_mstamp_get(&now);
+        age = skb_mstamp_us_delta(&now, &head->skb_mstamp);
+        /* If next ACK is likely to come too late (half srtt), do not defer */
+        if (age < (tp->srtt_us >> 4))
+                goto send_now;
+
         /* Ok, it looks like it is advisable to defer. */
 
         if (cong_win < send_win && cong_win < skb->len)