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, 11 insertions, 7 deletions

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 215afc74d8aa..a83bf067bdc5 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1697,21 +1697,25 @@ int __init fib6_init(void)
         ret = register_pernet_subsys(&fib6_net_ops);
         if (ret)
                 goto out_kmem_cache_create;
-
-        ret = __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib,
-                              NULL);
-        if (ret)
-                goto out_unregister_subsys;
 out:
         return ret;
 
-out_unregister_subsys:
-        unregister_pernet_subsys(&fib6_net_ops);
 out_kmem_cache_create:
         kmem_cache_destroy(fib6_node_kmem);
         goto out;
 }
 
+int __init fib6_init_late(void)
+{
+        return __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib,
+                               NULL);
+}
+
+void fib6_cleanup_late(void)
+{
+        rtnl_unregister(PF_INET6, RTM_GETROUTE);
+}
+
 void fib6_gc_cleanup(void)
 {
         unregister_pernet_subsys(&fib6_net_ops);