From patchwork Fri Jul 19 16:46:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 169257 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4081639ilk; Fri, 19 Jul 2019 09:46:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqwOo5FxcaXZUftyR5i1c9I3YusX9zxq9d+gKJF6gOShyu9PYq7t1OstY0QhkijcXlkjRKWt X-Received: by 2002:a17:902:d70a:: with SMTP id w10mr54986347ply.251.1563554799145; Fri, 19 Jul 2019 09:46:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563554799; cv=none; d=google.com; s=arc-20160816; b=YU6A6qHMW5Jq4gfCxgS6c4AGmpQtr06cO8Zm8bpESvCP8n/ESdVlWRyWS0zjYb98Kx T2Wc0N3jMM8Y0r1lKvzDLMwYC//BwCARGsJkN/Q22CL7xuirENS4hLDbJxWFcddnNDyH /0gEE733HGVTVUsF3HADJOtVkO1reMqKKVGdS2ixCIZd1ZQFXGoIN6IjC1jxX2VIKzd6 7A0l8O28bqhvtQmGQW9vO6JiN2Vvcyot9iclOamkThLWtsinWZd8eMT1kVkos26lKVH/ jKGc2rG3Bj5+Zh+JYwNTz4vh+6fLbtub+iZoG+jZgfm1thsIet+VNioFf2sd28/Gva4O 8fnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=9NDyVbJfiI7QXhKYUIQrnmtwtRN6eeuuS4I2Tw6JSqY=; b=VlhIidj01S3C3JBlgMaBGFwNMX0cpZjxRn4cYzkRk/JPDGulc08jzhAw1CE9bNt2AN i9/xfNMhT3YlflCl97TesQFnrDgL/r20eeo1xwDHNzNXJ8GgmBOef7i9S3IbNc0FoWSM Spm3hewkBd58qu+JSPcy027oN/z9p4D50zKVSFlPJg3ZP/PLNshTpCqdLKY1GwcukNi7 u6SaeLDhnPKBFWrFJ0tc0vq1y850lPQnxrE7p12bKTl81KWv3i7kY6t2b8CP+GTFAhp4 7uWMJ1H1c7SO0NUqtkWwjc0K0l+h6wS1SN0qs0FMaKbp0tVDDFe0qVITbeqYDG8RnWHQ z24A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d10si490987pgl.163.2019.07.19.09.46.38; Fri, 19 Jul 2019 09:46:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732176AbfGSQqi (ORCPT + 9 others); Fri, 19 Jul 2019 12:46:38 -0400 Received: from mail.us.es ([193.147.175.20]:50250 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732148AbfGSQqe (ORCPT ); Fri, 19 Jul 2019 12:46:34 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 8ACF0BAEE5 for ; Fri, 19 Jul 2019 18:46:32 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 7A6131150CC for ; Fri, 19 Jul 2019 18:46:32 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 6FE65DA708; Fri, 19 Jul 2019 18:46:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 69DD8FF6CC; Fri, 19 Jul 2019 18:46:30 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Fri, 19 Jul 2019 18:46:30 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (unknown [47.60.47.94]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id DA17B4265A2F; Fri, 19 Jul 2019 18:46:29 +0200 (CEST) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 14/14] netfilter: bridge: make NF_TABLES_BRIDGE tristate Date: Fri, 19 Jul 2019 18:46:18 +0200 Message-Id: <20190719164618.29581-5-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190719164618.29581-1-pablo@netfilter.org> References: <20190719164618.29581-1-pablo@netfilter.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann The new nft_meta_bridge code fails to link as built-in when NF_TABLES is a loadable module. net/bridge/netfilter/nft_meta_bridge.o: In function `nft_meta_bridge_get_eval': nft_meta_bridge.c:(.text+0x1e8): undefined reference to `nft_meta_get_eval' net/bridge/netfilter/nft_meta_bridge.o: In function `nft_meta_bridge_get_init': nft_meta_bridge.c:(.text+0x468): undefined reference to `nft_meta_get_init' nft_meta_bridge.c:(.text+0x49c): undefined reference to `nft_parse_register' nft_meta_bridge.c:(.text+0x4cc): undefined reference to `nft_validate_register_store' net/bridge/netfilter/nft_meta_bridge.o: In function `nft_meta_bridge_module_exit': nft_meta_bridge.c:(.exit.text+0x14): undefined reference to `nft_unregister_expr' net/bridge/netfilter/nft_meta_bridge.o: In function `nft_meta_bridge_module_init': nft_meta_bridge.c:(.init.text+0x14): undefined reference to `nft_register_expr' net/bridge/netfilter/nft_meta_bridge.o:(.rodata+0x60): undefined reference to `nft_meta_get_dump' net/bridge/netfilter/nft_meta_bridge.o:(.rodata+0x88): undefined reference to `nft_meta_set_eval' This can happen because the NF_TABLES_BRIDGE dependency itself is just a 'bool'. Make the symbol a 'tristate' instead so Kconfig can propagate the dependencies correctly. Fixes: 30e103fe24de ("netfilter: nft_meta: move bridge meta keys into nft_meta_bridge") Signed-off-by: Arnd Bergmann Signed-off-by: Pablo Neira Ayuso --- net/bridge/netfilter/Kconfig | 2 +- net/netfilter/nft_chain_filter.c | 2 +- net/netfilter/nft_meta.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.11.0 diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig index 30d8241b426f..5040fe43f4b4 100644 --- a/net/bridge/netfilter/Kconfig +++ b/net/bridge/netfilter/Kconfig @@ -6,7 +6,7 @@ menuconfig NF_TABLES_BRIDGE depends on BRIDGE && NETFILTER && NF_TABLES select NETFILTER_FAMILY_BRIDGE - bool "Ethernet Bridge nf_tables support" + tristate "Ethernet Bridge nf_tables support" if NF_TABLES_BRIDGE diff --git a/net/netfilter/nft_chain_filter.c b/net/netfilter/nft_chain_filter.c index 3fd540b2c6ba..b5d5d071d765 100644 --- a/net/netfilter/nft_chain_filter.c +++ b/net/netfilter/nft_chain_filter.c @@ -193,7 +193,7 @@ static inline void nft_chain_filter_inet_init(void) {} static inline void nft_chain_filter_inet_fini(void) {} #endif /* CONFIG_NF_TABLES_IPV6 */ -#ifdef CONFIG_NF_TABLES_BRIDGE +#if IS_ENABLED(CONFIG_NF_TABLES_BRIDGE) static unsigned int nft_do_chain_bridge(void *priv, struct sk_buff *skb, diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c index 865888933a83..f1b1d948c07b 100644 --- a/net/netfilter/nft_meta.c +++ b/net/netfilter/nft_meta.c @@ -546,7 +546,7 @@ nft_meta_select_ops(const struct nft_ctx *ctx, if (tb[NFTA_META_DREG] && tb[NFTA_META_SREG]) return ERR_PTR(-EINVAL); -#if defined(CONFIG_NF_TABLES_BRIDGE) && IS_MODULE(CONFIG_NFT_BRIDGE_META) +#if IS_ENABLED(CONFIG_NF_TABLES_BRIDGE) && IS_MODULE(CONFIG_NFT_BRIDGE_META) if (ctx->family == NFPROTO_BRIDGE) return ERR_PTR(-EAGAIN); #endif