sctp: Guard IPV6 specific code properly.
authorDavid S. Miller <davem@davemloft.net>
Mon, 6 Jun 2011 20:05:55 +0000 (13:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Jun 2011 20:05:55 +0000 (13:05 -0700)
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>
net/sctp/protocol.c

index af0a6b0fc9b6106ba56813bfe43b56a9f8edd630..ab5ded2c58deff5e6f507abc050a5d0d11e00599 100644 (file)
@@ -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;