[PATCHv2 ipsec-next 07/10] ip6_vti: support IP6IP tunnel processing

[Xin Long]

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....@gmail.com>
---
 net/ipv6/ip6_vti.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 2161648..d45111d 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -1264,7 +1264,10 @@ static int __init vti6_tunnel_init(void)
        msg = "ipv6 tunnel";
        err = xfrm6_tunnel_register(&vti_ipv6_handler, AF_INET6);
        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;
 
        msg = "netlink interface";
        err = rtnl_link_register(&vti6_link_ops);
@@ -1274,8 +1277,10 @@ static int __init vti6_tunnel_init(void)
        return 0;
 
 rtnl_link_failed:
+       err = xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET);
+vti_tunnel_ip6ip_failed:
        err = xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET6);
-vti_tunnel_failed:
+vti_tunnel_ipv6_failed:
        xfrm6_protocol_deregister(&vti_ipcomp6_protocol, IPPROTO_COMP);
 xfrm_proto_comp_failed:
        xfrm6_protocol_deregister(&vti_ah6_protocol, IPPROTO_AH);
@@ -1294,6 +1299,7 @@ static int __init vti6_tunnel_init(void)
 static void __exit vti6_tunnel_cleanup(void)
 {
        rtnl_link_unregister(&vti6_link_ops);
+       xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET);
        xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET6);
        xfrm6_protocol_deregister(&vti_ipcomp6_protocol, IPPROTO_COMP);
        xfrm6_protocol_deregister(&vti_ah6_protocol, IPPROTO_AH);
-- 
2.1.0