From patchwork Thu Sep 5 18:38:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 272934 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 EB7E72C00E9 for ; Fri, 6 Sep 2013 04:44:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755564Ab3IESij (ORCPT ); Thu, 5 Sep 2013 14:38:39 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:38285 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755499Ab3IESid (ORCPT ); Thu, 5 Sep 2013 14:38:33 -0400 Received: from localhost (nat-pool-rdu-t.redhat.com [66.187.233.202]) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id 47350588D9A; Thu, 5 Sep 2013 11:38:32 -0700 (PDT) Date: Thu, 05 Sep 2013 14:38:30 -0400 (EDT) Message-Id: <20130905.143830.660252697193033003.davem@davemloft.net> To: rdunlap@infradead.org Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org Subject: Re: linux-next: Tree for Sep 5 (netfilter: xt_socket.c) From: David Miller In-Reply-To: <5228C140.1010504@infradead.org> References: <20130905193249.8b7c57afd5e39349ff5508bb@canb.auug.org.au> <5228C140.1010504@infradead.org> X-Mailer: Mew version 6.5 on Emacs 24.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.1 (shards.monkeyblade.net [0.0.0.0]); Thu, 05 Sep 2013 11:38:33 -0700 (PDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Randy Dunlap Date: Thu, 05 Sep 2013 10:37:04 -0700 > On 09/05/13 02:32, Stephen Rothwell wrote: >> Hi all, >> >> Please do not add any code for v3.13 to your linux-next included branches >> until after v3.12-rc1 is released. >> >> Changes since 20130904: >> > > on x86_64: > > when CONFIG_IPV6=m > and CONFIG_NETFILTER_XT_MATCH_SOCKET=y: > > net/built-in.o: In function `socket_mt6_v1_v2': > xt_socket.c:(.text+0x51b55): undefined reference to `udp6_lib_lookup' > net/built-in.o: In function `socket_mt_init': > xt_socket.c:(.init.text+0x1ef8): undefined reference to `nf_defrag_ipv6_enable' I just commited the following to fix this: -------------------- [PATCH] netfilter: Fix build errors with xt_socket.c As reported by Randy Dunlap: Acked-by: Randy Dunlap ==================== when CONFIG_IPV6=m and CONFIG_NETFILTER_XT_MATCH_SOCKET=y: net/built-in.o: In function `socket_mt6_v1_v2': xt_socket.c:(.text+0x51b55): undefined reference to `udp6_lib_lookup' net/built-in.o: In function `socket_mt_init': xt_socket.c:(.init.text+0x1ef8): undefined reference to `nf_defrag_ipv6_enable' ==================== Like several other modules under net/netfilter/ we have to have a dependency "IPV6 disabled or set compatibly with this module" clause. Reported-by: Randy Dunlap Signed-off-by: David S. Miller --- net/netfilter/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 62a171a..6e839b6 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -1175,6 +1175,7 @@ config NETFILTER_XT_MATCH_SOCKET depends on NETFILTER_XTABLES depends on NETFILTER_ADVANCED depends on !NF_CONNTRACK || NF_CONNTRACK + depends on (IPV6 || IPV6=n) select NF_DEFRAG_IPV4 select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES help