diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-16 10:23:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-16 10:23:04 +0200 |
| commit | aee289baaa02dd2ffa1189c1600d5572a10e0714 (patch) | |
| tree | f9fa3cb33ead21400dbda2b19287f6f06754fcb6 /net/ipv6/ip6_fib.c | |
| parent | ipv6: Fix types of ip6_update_pmtu(). (diff) | |
| parent | Revert "ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ip... (diff) | |
| download | linux-aee289baaa02dd2ffa1189c1600d5572a10e0714.tar.xz linux-aee289baaa02dd2ffa1189c1600d5572a10e0714.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv6/route.c
Pull in 'net' again to get the revert of Thomas's change
which introduced regressions.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index a83bf067bdc5..215afc74d8aa 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1697,25 +1697,21 @@ 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); |