From a23b3114131d46ddb2d6ba3dbdd34ab09a5238c0 Mon Sep 17 00:00:00 2001
From: John Dykstra <john.dykstra1@gmail.com>
Date: Wed, 11 Mar 2009 09:22:51 -0700
Subject: [PATCH] --- yaml --- r: 132387 b: refs/heads/master c:
 ff8cf9a93800e8118ea097c1aba7203d59a0f3f1 h: refs/heads/master i:   132385:
 e2287a5540d1b42baf4bfbccb8dd68cdf1856846   132383:
 62ebf404059a95a0d5e988adaf01feced7b887f8 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/af_inet6.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f859b5562982..d42306975dfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db434ac6bff0d991d0b60166dc9d6405b873d0f7
+refs/heads/master: ff8cf9a93800e8118ea097c1aba7203d59a0f3f1
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index da944eca2ca6..9c8309ed35cf 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/net/ipv6/af_inet6.c
@@ -1192,6 +1192,9 @@ module_init(inet6_init);
 
 static void __exit inet6_exit(void)
 {
+	if (disable_ipv6)
+		return;
+
 	/* First of all disallow new sockets creation. */
 	sock_unregister(PF_INET6);
 	/* Disallow any further netlink messages */