diff options
| author | Ilpo Järvinen <[email protected]> | 2025-03-05 22:38:50 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2025-03-17 13:55:54 +0000 |
| commit | d722762c4eaa918d3d2f78b41cca3f480a616d65 (patch) | |
| tree | ce5d5b07a1e56c08725a6880c44172f89b5bc6f9 /net/ipv4/tcp_ipv4.c | |
| parent | gro: prevent ACE field corruption & better AccECN handling (diff) | |
| download | kernel-d722762c4eaa918d3d2f78b41cca3f480a616d65.tar.gz kernel-d722762c4eaa918d3d2f78b41cca3f480a616d65.zip | |
tcp: AccECN support to tcp_add_backlog
AE flag needs to be preserved for AccECN.
Signed-off-by: Ilpo Järvinen <[email protected]>
Signed-off-by: Chia-Yu Chang <[email protected]>
Reviewed-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index fab684221bf7..87f270ebc635 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2051,7 +2051,8 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb, !((TCP_SKB_CB(tail)->tcp_flags & TCP_SKB_CB(skb)->tcp_flags) & TCPHDR_ACK) || ((TCP_SKB_CB(tail)->tcp_flags ^ - TCP_SKB_CB(skb)->tcp_flags) & (TCPHDR_ECE | TCPHDR_CWR)) || + TCP_SKB_CB(skb)->tcp_flags) & + (TCPHDR_ECE | TCPHDR_CWR | TCPHDR_AE)) || !tcp_skb_can_collapse_rx(tail, skb) || thtail->doff != th->doff || memcmp(thtail + 1, th + 1, hdrlen - sizeof(*th))) |