From 1bd9177ee985bb037c1a6c37d54af41a78130648 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Fri, 7 Dec 2007 00:44:29 -0800
Subject: [PATCH] --- yaml --- r: 78360 b: refs/heads/master c:
 e2fddf5e96df4ac26f2e9ce63053d51cdf3cfe1e h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/af_inet6.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f5f704063e4e..aa36526029fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 433d49c3bb14b8a2351fe97df8359e4ad0de4c7c
+refs/heads/master: e2fddf5e96df4ac26f2e9ce63053d51cdf3cfe1e
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index 64135e2a3098..5ab8ba7a5863 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/net/ipv6/af_inet6.c
@@ -849,7 +849,9 @@ static int __init inet6_init(void)
 	if (if6_proc_init())
 		goto proc_if6_fail;
 #endif
-	ip6_route_init();
+	err = ip6_route_init();
+	if (err)
+		goto ip6_route_fail;
 	ip6_flowlabel_init();
 	err = addrconf_init();
 	if (err)
@@ -874,6 +876,7 @@ static int __init inet6_init(void)
 addrconf_fail:
 	ip6_flowlabel_cleanup();
 	ip6_route_cleanup();
+ip6_route_fail:
 #ifdef CONFIG_PROC_FS
 	if6_proc_exit();
 proc_if6_fail:
@@ -904,6 +907,7 @@ static int __init inet6_init(void)
 	cleanup_ipv6_mibs();
 out_unregister_sock:
 	sock_unregister(PF_INET6);
+	rtnl_unregister_all(PF_INET6);
 out_unregister_raw_proto:
 	proto_unregister(&rawv6_prot);
 out_unregister_udplite_proto: