diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-10-25 10:54:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-10-25 10:54:09 +0200 |
| commit | 0216ded72db896b24cbdd8cd6531482571b25cf6 (patch) | |
| tree | 56b578e29657bd3df8236c5f0cf6b8f13c17232a /net/ipv4/tcp_output.c | |
| parent | 52345d35622026b99271edc1c58ad7cfef3b7567 (diff) | |
| parent | 04177158cf98a79744937893b100020d77e6f9ac (diff) | |
Merge branch 'topic/compress-accel' into for-next
Pull compress-offload API extension for accel operation mode
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 4fd746bd4d54..68804fd01daf 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; |