diff options
| author | David S. Miller <davem@davemloft.net> | 2024-11-18 11:52:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-11-18 11:52:49 +0000 |
| commit | 296a681def3e105f8535c8b3cb0f37f22f710e62 (patch) | |
| tree | cc467d1494c9d25d948e05811f870fdcad0fda36 /net/ipv6 | |
| parent | 38f83a57aa8e644f37a88d4771d756303cfa7365 (diff) | |
| parent | a35672819f8d85e2ae38b80d40b923e3ef81e4ea (diff) | |
| download | lwn-296a681def3e105f8535c8b3cb0f37f22f710e62.tar.gz lwn-296a681def3e105f8535c8b3cb0f37f22f710e62.zip | |
Merge tag 'ipsec-next-2024-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
ipsec-next-11-15
1) Add support for RFC 9611 per cpu xfrm state handling.
2) Add inbound and outbound xfrm state caches to speed up
state lookups.
3) Convert xfrm to dscp_t. From Guillaume Nault.
4) Fix error handling in build_aevent.
From Everest K.C.
5) Replace strncpy with strscpy_pad in copy_to_user_auth.
From Daniel Yang.
6) Fix an uninitialized symbol during acquire state insertion.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/esp6_offload.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/esp6_offload.c b/net/ipv6/esp6_offload.c index 919ebfabbe4e..7b41fb4f00b5 100644 --- a/net/ipv6/esp6_offload.c +++ b/net/ipv6/esp6_offload.c @@ -80,9 +80,9 @@ static struct sk_buff *esp6_gro_receive(struct list_head *head, if (sp->len == XFRM_MAX_DEPTH) goto out_reset; - x = xfrm_state_lookup(dev_net(skb->dev), skb->mark, - (xfrm_address_t *)&ipv6_hdr(skb)->daddr, - spi, IPPROTO_ESP, AF_INET6); + x = xfrm_input_state_lookup(dev_net(skb->dev), skb->mark, + (xfrm_address_t *)&ipv6_hdr(skb)->daddr, + spi, IPPROTO_ESP, AF_INET6); if (unlikely(x && x->dir && x->dir != XFRM_SA_DIR_IN)) { /* non-offload path will record the error and audit log */ |