From patchwork Sun Aug 4 09:37:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 264469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CF1A92C0084 for ; Sun, 4 Aug 2013 19:38:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752635Ab3HDJiK (ORCPT ); Sun, 4 Aug 2013 05:38:10 -0400 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:50733 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753196Ab3HDJiH (ORCPT ); Sun, 4 Aug 2013 05:38:07 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.80) (envelope-from ) id 1V5ulI-0003bP-Dm; Sun, 04 Aug 2013 11:38:04 +0200 From: Florian Westphal To: netfilter-devel@vger.kernel.org Cc: pablo@netfilter.org, kbuild-all@01.org, fengguang.wu@intel.com, Florian Westphal Subject: [PATCH -next] netfilter: tproxy: fix build with IP6_NF_IPTABLES=n Date: Sun, 4 Aug 2013 11:37:29 +0200 Message-Id: <1375609049-28517-1-git-send-email-fw@strlen.de> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <51fd4909.9l/Oq5RafYHkZm62%fengguang.wu@intel.com> References: <51fd4909.9l/Oq5RafYHkZm62%fengguang.wu@intel.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org after commit 93742cf8af9dd3b053242b273040aa35fcbf93b3 (netfilter: tproxy: remove nf_tproxy_core.h) CONFIG_IPV6=y CONFIG_IP6_NF_IPTABLES=n gives us: net/netfilter/xt_TPROXY.c: In function 'nf_tproxy_get_sock_v6': net/netfilter/xt_TPROXY.c:178:4: error: implicit declaration of function 'inet6_lookup_listener' Reported-by: kbuild test robot Signed-off-by: Florian Westphal diff --git a/net/netfilter/xt_TPROXY.c b/net/netfilter/xt_TPROXY.c index 851383a..5d8a3a3 100644 --- a/net/netfilter/xt_TPROXY.c +++ b/net/netfilter/xt_TPROXY.c @@ -161,7 +161,7 @@ nf_tproxy_get_sock_v4(struct net *net, const u8 protocol, return sk; } -#if IS_ENABLED(CONFIG_IPV6) +#ifdef XT_TPROXY_HAVE_IPV6 static inline struct sock * nf_tproxy_get_sock_v6(struct net *net, const u8 protocol, const struct in6_addr *saddr, const struct in6_addr *daddr,