commit d1d30e7fb778a8fcc74d5489a90ff1629fa555a1
author Brian Vazquez <brianvv@google.com> Tue Nov 07 19:38:32 2023 +0000
committer Oleksandr Tymoshenko <ovt@google.com> Mon Dec 18 22:35:54 2023 +0000
tree 397e3b5ad13290cdd65c3d7b0ce8e19eddca3e2e
parent e6b41a4f45832b9d7af44c7b34c45693e7344705

Revert "UPSTREAM: tcp: pad TLP using min(tp->mdev_us, 2ms) instead of 2ms"

This reverts commit 136b8916a25f0bf056d761b59cb0cf5a8bee0282.

Reason for revert: b/308472523#comment30

Change-Id: I4205445fcd7e64673108ccda7af05c2e06c4d670
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/60797
Tested-by: Brian Vazquez <brianvv@google.com>
Reviewed-by: Brian Vazquez <brianvv@google.com>
Reviewed-by: Neal Cardwell <ncardwell@google.com>

net/ipv4/tcp_output.c

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8e62497..5eb9227 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2782,7 +2782,7 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto)
 		if (tp->packets_out == 1)
 			timeout_us += tcp_rto_min_us(sk);
 		else
-			timeout_us += min_t(u32, tp->mdev_us, TCP_TIMEOUT_MIN_US);
+			timeout_us += TCP_TIMEOUT_MIN_US;
 		timeout = usecs_to_jiffies(timeout_us);
 	} else {
 		timeout = TCP_TIMEOUT_INIT;