tunnels: fix netns vs proto registration ordering

Same stuff as in ip_gre patch: receive hook can be called before netns
setup is done, oopsing in net_generic().

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 7 deletions

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 95db732e542b..2f302d3ac9a3 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -830,15 +830,14 @@ static int __init ipip_init(void)
 
         printk(banner);
 
-        if (xfrm4_tunnel_register(&ipip_handler, AF_INET)) {
+        err = register_pernet_device(&ipip_net_ops);
+        if (err < 0)
+                return err;
+        err = xfrm4_tunnel_register(&ipip_handler, AF_INET);
+        if (err < 0) {
+                unregister_pernet_device(&ipip_net_ops);
                 printk(KERN_INFO "ipip init: can't register tunnel\n");
-                return -EAGAIN;
         }
-
-        err = register_pernet_device(&ipip_net_ops);
-        if (err)
-                xfrm4_tunnel_deregister(&ipip_handler, AF_INET);
-
         return err;
 }