From 072ce746acb969fb3c775613c0e0f08808a792eb Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 6 Jun 2011 13:05:55 -0700
Subject: [PATCH] --- yaml --- r: 255344 b: refs/heads/master c:
 5d0c90cf4d417ccafcd1af4ec32945c3f80e98e2 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/sctp/protocol.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3f4f724d4457..8fc2defd01f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3cc055c18ab575291acf0af7622a2e97c4728fa
+refs/heads/master: 5d0c90cf4d417ccafcd1af4ec32945c3f80e98e2
diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c
index af0a6b0fc9b6..ab5ded2c58de 100644
--- a/trunk/net/sctp/protocol.c
+++ b/trunk/net/sctp/protocol.c
@@ -637,6 +637,7 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)
 		    " for cmd %d at entry %p\n", &sctp_addr_waitq, &addrw->a, addrw->state,
 		    addrw);
 
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 		/* Now we send an ASCONF for each association */
 		/* Note. we currently don't handle link local IPv6 addressees */
 		if (addrw->a.sa.sa_family == AF_INET6) {
@@ -659,7 +660,7 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)
 				break;
 			}
 		}
-
+#endif
 		list_for_each_entry(sp, &sctp_auto_asconf_splist, auto_asconf_list) {
 			struct sock *sk;