From patchwork Fri Mar 4 09:35:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Graf X-Patchwork-Id: 85385 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 CFF63B70F2 for ; Fri, 4 Mar 2011 20:35:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759226Ab1CDJfW (ORCPT ); Fri, 4 Mar 2011 04:35:22 -0500 Received: from bombadil.infradead.org ([18.85.46.34]:45726 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758687Ab1CDJfS (ORCPT ); Fri, 4 Mar 2011 04:35:18 -0500 Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1PvRPh-0000Tm-HA; Fri, 04 Mar 2011 09:35:10 +0000 Received: from tgr by canuck.infradead.org with local (Exim 4.72 #1 (Red Hat Linux)) id 1PvRPf-0007gG-Jp; Fri, 04 Mar 2011 09:35:07 +0000 Date: Fri, 4 Mar 2011 04:35:07 -0500 From: Thomas Graf To: davem@davemloft.net Cc: Patrick McHardy , Stephen Rothwell , netdev@vger.kernel.org, linux-next@vger.kernel.org, Randy Dunlap Subject: [PATCH] net: Enter net/ipv6/ even if CONFIG_IPV6=n Message-ID: <20110304093507.GG10761@canuck.infradead.org> Mail-Followup-To: davem@davemloft.net, Patrick McHardy , Stephen Rothwell , netdev@vger.kernel.org, linux-next@vger.kernel.org, Randy Dunlap References: <20110210180525.54ec83e9.sfr@canb.auug.org.au> <20110210095210.6fcf3011.randy.dunlap@oracle.com> <4D58DB20.5060401@trash.net> <20110303135414.bfcabb2a.randy.dunlap@oracle.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110303135414.bfcabb2a.randy.dunlap@oracle.com> User-Agent: Mutt/1.5.20 (2009-08-17) X-SRS-Rewrite: SMTP reverse-path rewritten from by canuck.infradead.org See http://www.infradead.org/rpr.html Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org exthdrs_core.c and addrconf_core.c in net/ipv6/ contain bits which must be made available even if IPv6 is disabled. net/ipv6/Makefile already correctly includes them if CONFIG_IPV6=n but net/Makefile prevents entering the subdirectory. Signed-off-by: Thomas Graf Acked-by: Randy Dunlap --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/Makefile b/net/Makefile index a3330eb..a51d946 100644 --- a/net/Makefile +++ b/net/Makefile @@ -19,9 +19,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_INET) += ipv4/ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ -ifneq ($(CONFIG_IPV6),) -obj-y += ipv6/ -endif +obj-$(CONFIG_NET) += ipv6/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/