From patchwork Thu Sep 19 20:18:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 276055 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 E7BBF2C00CB for ; Fri, 20 Sep 2013 06:19:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752738Ab3ISUTH (ORCPT ); Thu, 19 Sep 2013 16:19:07 -0400 Received: from mail.us.es ([193.147.175.20]:37711 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753335Ab3ISUTH (ORCPT ); Thu, 19 Sep 2013 16:19:07 -0400 Received: (qmail 3057 invoked from network); 19 Sep 2013 22:19:05 +0200 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 19 Sep 2013 22:19:05 +0200 Received: (qmail 13754 invoked by uid 507); 19 Sep 2013 20:19:03 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.8/17872. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-99.8/7.5):. Processed in 4.795464 secs); 19 Sep 2013 20:19:03 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-99.8 required=7.5 tests=BAYES_50,RCVD_IN_PBL, RCVD_IN_RP_RNBL, RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 188.76.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 19 Sep 2013 20:18:58 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/410/antivirus1); Thu, 19 Sep 2013 22:18:58 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/410/antivirus1) Received: (qmail 1758 invoked from network); 19 Sep 2013 22:19:00 +0200 Received: from 23.149.76.188.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@188.76.149.23) by mail.us.es with SMTP; 19 Sep 2013 22:19:00 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH -nftables 3/3] netfilter: fix missing dependency Date: Thu, 19 Sep 2013 22:18:53 +0200 Message-Id: <1379621933-6064-3-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1379621933-6064-1-git-send-email-pablo@netfilter.org> References: <1379621933-6064-1-git-send-email-pablo@netfilter.org> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org With CONFIG_NFT_CHAIN_NAT_IPV4=y net/ipv4/netfilter/nft_chain_nat_ipv4.c: In function ‘nf_nat_fn’: net/ipv4/netfilter/nft_chain_nat_ipv4.c:56:1: error: ‘NF_CT_EXT_NAT’ undeclared (first use in this function) net/ipv4/netfilter/nft_chain_nat_ipv4.c:56:1: note: each undeclared identifier is reported only once for each function it appears in Reported-by: Bjørnar Ness Signed-off-by: Pablo Neira Ayuso --- net/ipv4/netfilter/Kconfig | 2 +- net/ipv6/netfilter/Kconfig | 2 +- net/netfilter/Kconfig | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 4d6f03a..1ea0da4 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -50,7 +50,7 @@ config NFT_CHAIN_ROUTE_IPV4 config NFT_CHAIN_NAT_IPV4 depends on NF_TABLES_IPV4 - depends on NFT_NAT + depends on NF_NAT_IPV4 && NFT_NAT tristate "IPv4 nf_tables nat chain support" config NF_TABLES_ARP diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 61270d1..4863516 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -35,7 +35,7 @@ config NFT_CHAIN_ROUTE_IPV6 config NFT_CHAIN_NAT_IPV6 depends on NF_TABLES_IPV6 - depends on NFT_NAT + depends on NF_NAT_IPV6 && NFT_NAT tristate "IPv6 nf_tables nat chain support" config IP6_NF_IPTABLES diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 2e0c3f8..8e2ffe3 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -464,6 +464,7 @@ config NFT_LIMIT config NFT_NAT depends on NF_TABLES depends on NF_CONNTRACK + depends on NF_NAT tristate "Netfilter nf_tables nat module" config NFT_COMPAT