From: Jakub Kicinski Date: Wed, 13 Dec 2023 18:56:29 +0000 (-0800) Subject: Revert "tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set" X-Git-Tag: v6.7-rc6~21^2~8 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9702817384aa4a3700643d0b26e71deac0172cfd;p=users%2Fdwmw2%2Flinux.git Revert "tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set" This reverts commit f3f32a356c0d2379d4431364e74f101f8f075ce3. Paolo reports that the change disables autocorking even after the userspace sets TCP_CORK. Fixes: f3f32a356c0d ("tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set") Link: https://lore.kernel.org/r/0d30d5a41d3ac990573016308aaeacb40a9dc79f.camel@redhat.com Signed-off-by: Jakub Kicinski --- diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 96fc89ccec335..ff6838ca2e580 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -716,7 +716,7 @@ void tcp_push(struct sock *sk, int flags, int mss_now, tcp_mark_urg(tp, flags); - if (!nonagle && tcp_should_autocork(sk, skb, size_goal)) { + if (tcp_should_autocork(sk, skb, size_goal)) { /* avoid atomic op if TSQ_THROTTLED bit is already set */ if (!test_bit(TSQ_THROTTLED, &sk->sk_tsq_flags)) {