diff options
| author | David S. Miller <davem@davemloft.net> | 2024-03-08 10:56:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-03-08 10:56:05 +0000 |
| commit | 3dbf6d67f2d81f1a80cee9fdb391c1ff3ee7cd8d (patch) | |
| tree | 52cbccaca1f12475bbbd6c748dcd8715ff3a7276 /net/ipv6 | |
| parent | 7cf497e5a122c0828d22cc563e70eb400dc57769 (diff) | |
| parent | aceb147b20a2eda9a10bdd4b5650718f731ef3e1 (diff) | |
Merge tag 'ipsec-next-2024-03-06' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
1) Introduce forwarding of ICMP Error messages. That is specified
in RFC 4301 but was never implemented. From Antony Antony.
2) Use KMEM_CACHE instead of kmem_cache_create in xfrm6_tunnel_init()
and xfrm_policy_init(). From Kunwu Chan.
3) Do not allocate stats in the xfrm interface driver, this can be done
on net core now. From Breno Leitao.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index f6cb94f82cc3..bf140ef781c1 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c @@ -355,10 +355,7 @@ static int __init xfrm6_tunnel_init(void) { int rv; - xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi", - sizeof(struct xfrm6_tunnel_spi), - 0, SLAB_HWCACHE_ALIGN, - NULL); + xfrm6_tunnel_spi_kmem = KMEM_CACHE(xfrm6_tunnel_spi, SLAB_HWCACHE_ALIGN); if (!xfrm6_tunnel_spi_kmem) return -ENOMEM; rv = register_pernet_subsys(&xfrm6_tunnel_net_ops); |