From: David S. Miller <davem@davemloft.net>
Date: Sat, 16 Jun 2012 08:23:04 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=aee289baaa02dd2ffa1189c1600d5572a10e0714;p=deliverable%2Flinux.git

Merge git://git./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>
---

aee289baaa02dd2ffa1189c1600d5572a10e0714
diff --cc net/ipv6/route.c
index 1c279fe2c9b4,999a982ad3fd..e649cd78c15f
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -2974,18 -3018,10 +2974,14 @@@ int __init ip6_route_init(void
  	if (ret)
  		goto out_kmem_cache;
  
- 	ret = fib6_init();
- 	if (ret)
- 		goto out_dst_entries;
- 
 -	ret = register_pernet_subsys(&ip6_route_net_ops);
 +	ret = register_pernet_subsys(&ipv6_inetpeer_ops);
  	if (ret)
- 		goto out_fib6_init;
+ 		goto out_dst_entries;
  
 +	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;
  
  	/* Registering of the loopback is done before this portion of code,
@@@ -3028,14 -3064,10 +3024,12 @@@ fib6_rules_init
  	fib6_rules_cleanup();
  xfrm6_init:
  	xfrm6_fini();
- out_fib6_init_late:
- 	fib6_cleanup_late();
+ out_fib6_init:
+ 	fib6_gc_cleanup();
  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: