diff options
author | Jakub Kicinski <kuba@kernel.org> | 2024-10-03 10:05:55 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-10-10 13:13:33 -0700 |
commit | 9c0fc36ec493d20599cf088d21b6bddcdc184242 (patch) | |
tree | 79d8fb91469d59cc1dd0a55477778f0a1167de8f /net/ipv4/tcp_output.c | |
parent | cd959bf7c3bbaf64a29750c5e36776078a18a8fe (diff) | |
parent | 1d227fcc72223cbdd34d0ce13541cbaab5e0d72f (diff) | |
download | linux-9c0fc36ec493d20599cf088d21b6bddcdc184242.tar.gz linux-9c0fc36ec493d20599cf088d21b6bddcdc184242.tar.bz2 linux-9c0fc36ec493d20599cf088d21b6bddcdc184242.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.12-rc3).
No conflicts and no adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 1251510f0e58..06200bb111f8 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2342,10 +2342,7 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len) if (len <= skb->len) break; - if (unlikely(TCP_SKB_CB(skb)->eor) || - tcp_has_tx_tstamp(skb) || - !skb_pure_zcopy_same(skb, next) || - skb_frags_readable(skb) != skb_frags_readable(next)) + if (tcp_has_tx_tstamp(skb) || !tcp_skb_can_collapse(skb, next)) return false; len -= skb->len; |