Commit 97028173 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Revert "tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set" 

This reverts commit f3f32a35.

Paolo reports that the change disables autocorking even after
the userspace sets TCP_CORK.

Fixes: f3f32a35 ("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: default avatarJakub Kicinski <kuba@kernel.org>
parent 2513974c

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {