summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-06-06 13:05:55 -0700
committerDavid S. Miller <davem@davemloft.net>2011-06-06 13:05:55 -0700
commit5d0c90cf4d417ccafcd1af4ec32945c3f80e98e2 (patch)
treea20778871b29a651aef304131389fe964886aa57
parente3cc055c18ab575291acf0af7622a2e97c4728fa (diff)
downloadlinux-3.10-5d0c90cf4d417ccafcd1af4ec32945c3f80e98e2.tar.gz
linux-3.10-5d0c90cf4d417ccafcd1af4ec32945c3f80e98e2.tar.bz2
linux-3.10-5d0c90cf4d417ccafcd1af4ec32945c3f80e98e2.zip
sctp: Guard IPV6 specific code properly.
Outside of net/sctp/ipv6.c, IPV6 specific code needs to be ifdef guarded. This fixes build failures with IPV6 disabled. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/protocol.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index af0a6b0fc9b..ab5ded2c58d 100644
--- a/net/sctp/protocol.c
+++ b/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;