leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ip6_vti: support IP6IP tunnel processing

Browse Source 
For IP6IP tunnel processing, the functions called will be the
same as that for IP6IP6 tunnel's. So reuse it and register it
with family == 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-06 20:01:35 +08:00 committed by Steffen Klassert
parent 08622869ed
commit 2ab110cbb0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv6/ip6_vti.c
View File

@ -1267,7 +1267,10 @@ static int __init vti6_tunnel_init(void)
msg = "ipv6 tunnel"; msg = "ipv6 tunnel";
err = xfrm6_tunnel_register(&vti_ipv6_handler, AF_INET6); err = xfrm6_tunnel_register(&vti_ipv6_handler, AF_INET6);
if (err < 0) if (err < 0)
goto vti_tunnel_failed; goto vti_tunnel_ipv6_failed;
err = xfrm6_tunnel_register(&vti_ipv6_handler, AF_INET);
if (err < 0)
goto vti_tunnel_ip6ip_failed;
#endif #endif
msg = "netlink interface"; msg = "netlink interface";
@ -1279,8 +1282,10 @@ static int __init vti6_tunnel_init(void)
rtnl_link_failed: rtnl_link_failed:
#if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL) #if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL)
err = xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET);
vti_tunnel_ip6ip_failed:
err = xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET6); err = xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET6);
vti_tunnel_failed: vti_tunnel_ipv6_failed:
#endif #endif
xfrm6_protocol_deregister(&vti_ipcomp6_protocol, IPPROTO_COMP); xfrm6_protocol_deregister(&vti_ipcomp6_protocol, IPPROTO_COMP);
xfrm_proto_comp_failed: xfrm_proto_comp_failed:
@ -1301,6 +1306,7 @@ static void __exit vti6_tunnel_cleanup(void)
{ {
rtnl_link_unregister(&vti6_link_ops); rtnl_link_unregister(&vti6_link_ops);
#if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL) #if IS_ENABLED(CONFIG_INET6_XFRM_TUNNEL)
xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET);
xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET6); xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET6);
#endif #endif
xfrm6_protocol_deregister(&vti_ipcomp6_protocol, IPPROTO_COMP); xfrm6_protocol_deregister(&vti_ipcomp6_protocol, IPPROTO_COMP);