tunnels: fix netns vs proto registration ordering

[safe/jmp/linux-2.6] / net / ipv6 / ip6_tunnel.c

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index fbd7869..9b02492 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1461,27 +1461,29 @@ static int __init ip6_tunnel_init(void)
 {
        int  err;
 
-       if (xfrm6_tunnel_register(&ip4ip6_handler, AF_INET)) {
+       err = register_pernet_device(&ip6_tnl_net_ops);
+       if (err < 0)
+               goto out_pernet;
+
+       err = xfrm6_tunnel_register(&ip4ip6_handler, AF_INET);
+       if (err < 0) {
                printk(KERN_ERR "ip6_tunnel init: can't register ip4ip6\n");
-               err = -EAGAIN;
-               goto out;
+               goto out_ip4ip6;
        }
 
-       if (xfrm6_tunnel_register(&ip6ip6_handler, AF_INET6)) {
+       err = xfrm6_tunnel_register(&ip6ip6_handler, AF_INET6);
+       if (err < 0) {
                printk(KERN_ERR "ip6_tunnel init: can't register ip6ip6\n");
-               err = -EAGAIN;
-               goto unreg_ip4ip6;
+               goto out_ip6ip6;
        }
 
-       err = register_pernet_device(&ip6_tnl_net_ops);
-       if (err < 0)
-               goto err_pernet;
        return 0;
-err_pernet:
-       xfrm6_tunnel_deregister(&ip6ip6_handler, AF_INET6);
-unreg_ip4ip6:
+
+out_ip6ip6:
        xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET);
-out:
+out_ip4ip6:
+       unregister_pernet_device(&ip6_tnl_net_ops);
+out_pernet:
        return err;
 }