Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv6/route.c

This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade8e1783c5d453948289e4a978d417c9 which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 9 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 0d41f68daff2..c7ccc36ba63e 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2974,13 +2974,17 @@ int __init ip6_route_init(void)
         if (ret)
                 goto out_kmem_cache;
 
-        ret = register_pernet_subsys(&ip6_route_net_ops);
+        ret = fib6_init();
         if (ret)
                 goto out_dst_entries;
 
         ret = register_pernet_subsys(&ipv6_inetpeer_ops);
         if (ret)
-                goto out_register_subsys;
+                goto out_fib6_init;
+
+        ret = register_pernet_subsys(&ip6_route_net_ops);
+        if (ret)
+                goto out_register_inetpeer;
 
         ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops_template.kmem_cachep;
 
@@ -2995,13 +2999,13 @@ int __init ip6_route_init(void)
         init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
         init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
   #endif
-        ret = fib6_init();
+        ret = fib6_init_late();
         if (ret)
-                goto out_register_inetpeer;
+                goto out_register_subsys;
 
         ret = xfrm6_init();
         if (ret)
-                goto out_fib6_init;
+                goto out_fib6_init_late;
 
         ret = fib6_rules_init();
         if (ret)
@@ -3024,12 +3028,14 @@ fib6_rules_init:
         fib6_rules_cleanup();
 xfrm6_init:
         xfrm6_fini();
-out_fib6_init:
-        fib6_gc_cleanup();
-out_register_inetpeer:
-        unregister_pernet_subsys(&ipv6_inetpeer_ops);
+out_fib6_init_late:
+        fib6_cleanup_late();
 out_register_subsys:
         unregister_pernet_subsys(&ip6_route_net_ops);
+out_register_inetpeer:
+        unregister_pernet_subsys(&ipv6_inetpeer_ops);
+out_fib6_init:
+        fib6_gc_cleanup();
 out_dst_entries:
         dst_entries_destroy(&ip6_dst_blackhole_ops);
 out_kmem_cache: