mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
Revert "tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set"
This reverts commitf3f32a356c
. Paolo reports that the change disables autocorking even after the userspace sets TCP_CORK. Fixes:f3f32a356c
("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 <kuba@kernel.org>
This commit is contained in:
parent
2513974cc3
commit
9702817384
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user