diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-04-03 13:21:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-04-06 17:34:31 +0100 |
| commit | 9f06f87fef689d28588cde8c7ebb00a67da34026 (patch) | |
| tree | 597fb380446889e487955fe12877805fc90d4699 /net/ipv4/tcp_ipv4.c | |
| parent | 0d875bb4a72ee0e129cca674a5a1c06ff2e67d78 (diff) | |
| download | linux-stable-9f06f87fef689d28588cde8c7ebb00a67da34026.tar.gz linux-stable-9f06f87fef689d28588cde8c7ebb00a67da34026.tar.bz2 linux-stable-9f06f87fef689d28588cde8c7ebb00a67da34026.zip | |
net: skbuff: generalize the skb->decrypted bit
The ->decrypted bit can be reused for other crypto protocols.
Remove the direct dependency on TLS, add helpers to clean up
the ifdefs leaking out everywhere.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 56b75efcfd12..52963c3bb8ca 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2044,10 +2044,8 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb, TCP_SKB_CB(skb)->tcp_flags) & TCPHDR_ACK) || ((TCP_SKB_CB(tail)->tcp_flags ^ TCP_SKB_CB(skb)->tcp_flags) & (TCPHDR_ECE | TCPHDR_CWR)) || -#ifdef CONFIG_TLS_DEVICE - tail->decrypted != skb->decrypted || -#endif !mptcp_skb_can_collapse(tail, skb) || + skb_cmp_decrypted(tail, skb) || thtail->doff != th->doff || memcmp(thtail + 1, th + 1, hdrlen - sizeof(*th))) goto no_coalesce; |