hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfrm: interface: not xfrmi_ipv6/ipip_handler twice 

As we did in the last 2 patches for vti(6), this patch is to define a
new xfrm_tunnel object 'xfrmi_ipip6_handler' to register for AF_INET6,
and a new xfrm6_tunnel object 'xfrmi_ip6ip_handler' to register for
AF_INET.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Xin Long 2020-07-13 15:42:38 +08:00 committed by Steffen Klassert
parent a875714790
commit 8b404f46dd
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/xfrm/xfrm_interface.c
View File

@ -830,6 +830,13 @@ static struct xfrm6_tunnel xfrmi_ipv6_handler __read_mostly = {
.err_handler = xfrmi6_err, .err_handler = xfrmi6_err,
.priority = -1, .priority = -1,
}; };
static struct xfrm6_tunnel xfrmi_ip6ip_handler __read_mostly = {
.handler = xfrmi6_rcv_tunnel,
.cb_handler = xfrmi_rcv_cb,
.err_handler = xfrmi6_err,
.priority = -1,
};
#endif #endif
static struct xfrm4_protocol xfrmi_esp4_protocol __read_mostly = { static struct xfrm4_protocol xfrmi_esp4_protocol __read_mostly = {
@ -868,6 +875,13 @@ static struct xfrm_tunnel xfrmi_ipip_handler __read_mostly = {
.err_handler = xfrmi4_err, .err_handler = xfrmi4_err,
.priority = -1, .priority = -1,
}; };
static struct xfrm_tunnel xfrmi_ipip6_handler __read_mostly = {
.handler = xfrmi4_rcv_tunnel,
.cb_handler = xfrmi_rcv_cb,
.err_handler = xfrmi4_err,
.priority = -1,
};
#endif #endif
static int __init xfrmi4_init(void) static int __init xfrmi4_init(void)
@ -887,7 +901,7 @@ static int __init xfrmi4_init(void)
err = xfrm4_tunnel_register(&xfrmi_ipip_handler, AF_INET); err = xfrm4_tunnel_register(&xfrmi_ipip_handler, AF_INET);
if (err < 0) if (err < 0)
goto xfrm_tunnel_ipip_failed; goto xfrm_tunnel_ipip_failed;
err = xfrm4_tunnel_register(&xfrmi_ipip_handler, AF_INET6); err = xfrm4_tunnel_register(&xfrmi_ipip6_handler, AF_INET6);
if (err < 0) if (err < 0)
goto xfrm_tunnel_ipip6_failed; goto xfrm_tunnel_ipip6_failed;
#endif #endif
@ -911,7 +925,7 @@ xfrm_proto_esp_failed:
static void xfrmi4_fini(void) static void xfrmi4_fini(void)
{ {
#if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL) #if IS_ENABLED(CONFIG_INET_XFRM_TUNNEL)
xfrm4_tunnel_deregister(&xfrmi_ipip_handler, AF_INET6); xfrm4_tunnel_deregister(&xfrmi_ipip6_handler, AF_INET6);
xfrm4_tunnel_deregister(&xfrmi_ipip_handler, AF_INET); xfrm4_tunnel_deregister(&xfrmi_ipip_handler, AF_INET);
#endif #endif
xfrm4_protocol_deregister(&xfrmi_ipcomp4_protocol, IPPROTO_COMP); xfrm4_protocol_deregister(&xfrmi_ipcomp4_protocol, IPPROTO_COMP);
@ -936,7 +950,7 @@ static int __init xfrmi6_init(void)
err = xfrm6_tunnel_register(&xfrmi_ipv6_handler, AF_INET6); err = xfrm6_tunnel_register(&xfrmi_ipv6_handler, AF_INET6);
if (err < 0) if (err < 0)
goto xfrm_tunnel_ipv6_failed; goto xfrm_tunnel_ipv6_failed;
err = xfrm6_tunnel_register(&xfrmi_ipv6_handler, AF_INET); err = xfrm6_tunnel_register(&xfrmi_ip6ip_handler, AF_INET);
if (err < 0) if (err < 0)
goto xfrm_tunnel_ip6ip_failed; goto xfrm_tunnel_ip6ip_failed;
#endif #endif
@ -960,7 +974,7 @@ xfrm_proto_esp_failed:
static void xfrmi6_fini(void) static void xfrmi6_fini(void)
{ {
#if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL) #if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL)
xfrm6_tunnel_deregister(&xfrmi_ipv6_handler, AF_INET); xfrm6_tunnel_deregister(&xfrmi_ip6ip_handler, AF_INET);
xfrm6_tunnel_deregister(&xfrmi_ipv6_handler, AF_INET6); xfrm6_tunnel_deregister(&xfrmi_ipv6_handler, AF_INET6);
#endif #endif
xfrm6_protocol_deregister(&xfrmi_ipcomp6_protocol, IPPROTO_COMP); xfrm6_protocol_deregister(&xfrmi_ipcomp6_protocol, IPPROTO_COMP);