From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753540AbcBBCbZ (ORCPT ); Mon, 1 Feb 2016 21:31:25 -0500 Received: from mail-ig0-f171.google.com ([209.85.213.171]:38842 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751991AbcBBCbX (ORCPT ); Mon, 1 Feb 2016 21:31:23 -0500 From: Eric Biggers To: pablo@netfilter.org Cc: kaber@trash.net, kadlec@blackhole.kfki.hu, davem@davemloft.net, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Biggers Subject: [PATCH] netfilter: nft_ct: define nft_ct_get_eval_counter() only when needed Date: Mon, 1 Feb 2016 20:30:57 -0600 Message-Id: <1454380257-27195-1-git-send-email-ebiggers3@gmail.com> X-Mailer: git-send-email 2.7.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This eliminates an "unused function" compiler warning when CONFIG_NF_CONNTRACK_LABELS is not defined. Signed-off-by: Eric Biggers --- net/netfilter/nft_ct.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index a0eb216..3cd6b5b 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -31,6 +31,7 @@ struct nft_ct { }; }; +#ifdef CONFIG_NF_CONNTRACK_LABELS static u64 nft_ct_get_eval_counter(const struct nf_conn_counter *c, enum nft_ct_keys k, enum ip_conntrack_dir d) @@ -42,6 +43,7 @@ static u64 nft_ct_get_eval_counter(const struct nf_conn_counter *c, return nft_ct_get_eval_counter(c, k, IP_CT_DIR_ORIGINAL) + nft_ct_get_eval_counter(c, k, IP_CT_DIR_REPLY); } +#endif static void nft_ct_get_eval(const struct nft_expr *expr, struct nft_regs *regs, -- 2.7.0