From patchwork Mon Jun 6 20:06:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 99024 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 641FEB6F8B for ; Tue, 7 Jun 2011 06:07:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756833Ab1FFUGg (ORCPT ); Mon, 6 Jun 2011 16:06:36 -0400 Received: from shards.monkeyblade.net ([198.137.202.13]:45894 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756453Ab1FFUGe (ORCPT ); Mon, 6 Jun 2011 16:06:34 -0400 Received: from localhost (74-93-104-100-Washington.hfc.comcastbusiness.net [74.93.104.100]) (authenticated bits=0) by shards.monkeyblade.net (8.14.4/8.14.4) with ESMTP id p56K6LOq001922 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 6 Jun 2011 13:06:21 -0700 Date: Mon, 06 Jun 2011 13:06:20 -0700 (PDT) Message-Id: <20110606.130620.1866725220563870006.davem@davemloft.net> To: randy.dunlap@oracle.com Cc: sfr@canb.auug.org.au, linux-sctp@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: linux-next: Tree for June 6 (sctp) From: David Miller In-Reply-To: <20110606125532.793b3cfd.randy.dunlap@oracle.com> References: <20110606132036.aebd73a4.sfr@canb.auug.org.au> <20110606125532.793b3cfd.randy.dunlap@oracle.com> X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (shards.monkeyblade.net [198.137.202.13]); Mon, 06 Jun 2011 13:06:22 -0700 (PDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Randy Dunlap Date: Mon, 6 Jun 2011 12:55:32 -0700 > On Mon, 6 Jun 2011 13:20:36 +1000 Stephen Rothwell wrote: > >> Hi all, >> >> Changes since 20110603: > > > when CONFIG_IPV6 is not enabled: > > ERROR: "ipv6_chk_addr" [net/sctp/sctp.ko] undefined! I'll push the following after some build testing, thanks. -------------------- 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 Signed-off-by: David S. Miller --- net/sctp/protocol.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index af0a6b0..ab5ded2 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;