From: Menglong Dong <menglong8.dong@gmail.com>
Date: Thu, 3 Oct 2024 08:22:31 +0000 (+0800)
Subject: net: tcp: refresh tcp_mstamp for compressed ack in timer
X-Git-Tag: v6.13-rc1~135^2~408
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=269084f748524fa1a3fb8eb530eb70f77e7c3e4a;p=thirdparty%2Fkernel%2Flinux.git

net: tcp: refresh tcp_mstamp for compressed ack in timer

For now, we refresh the tcp_mstamp for delayed acks and keepalives, but
not for the compressed ack in tcp_compressed_ack_kick().

I have not found out the effact of the tcp_mstamp when sending ack, but
we can still refresh it for the compressed ack to keep consistent.

Signed-off-by: Menglong Dong <dongml2@chinatelecom.cn>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20241003082231.759759-1-dongml2@chinatelecom.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index c3a7442332d49..b412ed88ccd9a 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -865,6 +865,7 @@ static enum hrtimer_restart tcp_compressed_ack_kick(struct hrtimer *timer)
 			 * LINUX_MIB_TCPACKCOMPRESSED accurate.
 			 */
 			tp->compressed_ack--;
+			tcp_mstamp_refresh(tp);
 			tcp_send_ack(sk);
 		}
 	} else {