1 files changed, 9 insertions, 6 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 06228e2d010e..96bdb8eae9bb 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -165,13 +165,16 @@ static void tcp_event_data_sent(struct tcp_sock *tp,
         if (tcp_packets_in_flight(tp) == 0)
                 tcp_ca_event(sk, CA_EVENT_TX_START);
 
-        tp->lsndtime = now;
-
-        /* If it is a reply for ato after last received
-         * packet, enter pingpong mode.
+        /* If this is the first data packet sent in response to the
+         * previous received data,
+         * and it is a reply for ato after last received packet,
+         * increase pingpong count.
          */
-        if ((u32)(now - icsk->icsk_ack.lrcvtime) < icsk->icsk_ack.ato)
-                inet_csk_enter_pingpong_mode(sk);
+        if (before(tp->lsndtime, icsk->icsk_ack.lrcvtime) &&
+            (u32)(now - icsk->icsk_ack.lrcvtime) < icsk->icsk_ack.ato)
+                inet_csk_inc_pingpong_cnt(sk);
+
+        tp->lsndtime = now;
 }
 
 /* Account for an ACK we sent. */