From patchwork Fri Nov 16 02:34:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Yasevich X-Patchwork-Id: 199480 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 F23892C0080 for ; Fri, 16 Nov 2012 13:35:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751109Ab2KPCfO (ORCPT ); Thu, 15 Nov 2012 21:35:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40015 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750804Ab2KPCfN (ORCPT ); Thu, 15 Nov 2012 21:35:13 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAG2YxVR025238 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 15 Nov 2012 21:34:59 -0500 Received: from vyasevic.redhat.com (ovpn-113-147.phx2.redhat.com [10.3.113.147]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAG2YwaF031055; Thu, 15 Nov 2012 21:34:58 -0500 From: Vlad Yasevich To: netdev@vger.kernel.org Cc: davem@davemloft.net, fengguang.wu@intel.com Subject: [PATCH 1/2] net: Make IPv6 build depend on CONFIG_INET Date: Thu, 15 Nov 2012 21:34:57 -0500 Message-Id: <1353033297-2724-1-git-send-email-vyasevic@redhat.com> In-Reply-To: <50a57815.U2EL8TTOk3ffGeV3%fengguang.wu@intel.com> References: <50a57815.U2EL8TTOk3ffGeV3%fengguang.wu@intel.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org IPv6 build selection currently controlled by CONFIG_NET, so it is possible to build IPv6 functinality without selectiona any TCP/IP features (CONFIG_INET). Make IPv6 be consistent with IPv4. This should resolve the following issue: net/built-in.o: In function `tcp6_gro_complete': tcpv6_offload.c:(.text+0x3d045): undefined reference to `tcp_gro_complete' net/built-in.o: In function `tcp6_gro_receive': tcpv6_offload.c:(.text+0x3d19b): undefined reference to `tcp_gro_receive' net/built-in.o: In function `ipv6_exthdrs_offload_init': (.init.text+0x118b): undefined reference to `inet_del_offload' net/built-in.o:(.rodata+0x1c58): undefined reference to `tcp_tso_segment' Signed-off-by: Vlad Yasevich --- net/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/Makefile b/net/Makefile index 4f4ee08..e050d9d 100644 --- a/net/Makefile +++ b/net/Makefile @@ -19,7 +19,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_INET) += ipv4/ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ -obj-$(CONFIG_NET) += ipv6/ +obj-$(CONFIG_INET) += ipv6/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/