From patchwork Tue Feb 2 02:30:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 576894 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 3EC76140B0F for ; Tue, 2 Feb 2016 13:31:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=kyQAwqkY; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753089AbcBBCbZ (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 Received: by mail-ig0-f171.google.com with SMTP id mw1so1418787igb.1; Mon, 01 Feb 2016 18:31:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=F/zJOqfCkK9DQxzfhSbr7OYOyM0hHOwRI9n/C4J36Fo=; b=kyQAwqkYJem8Q3UE/VCC5ulNwD7GDtk8wreut/N4rO4Ne73TH7/TqGB4+xB0Yhx2Je 5aPp2qVZ6gbfWvfsMZEXnCJTIbKmn8mfV4nywX9VQYE/76Em9/VJ8OBmXUwI6imNjAgd RGhw2WClQoI00T/TIFrxwnyasS815X7M0/Wtrbot1cCPWdrIDULIQRq8Fnisxf6rAzI4 IN1bTK1nXVZunG6iWXhEV2zO9lUekt3876Vg60iAj/HwhYEvk+nkEYDRav+9iWwjt5CD zTlRTEtFkRj7vg69bee/tAW6MzWSBKnf9VEf/VFq6AIY1Kif/9dgoQD0VmIKBLe0xong miRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=F/zJOqfCkK9DQxzfhSbr7OYOyM0hHOwRI9n/C4J36Fo=; b=TNLCX+jWX5fz+RLbOmPd9+YK5rv8fyAYSMeIXmvDAs3CXRISUTrcA6V+DRrGDSGRMw hoUJcea//n+PusHqUCV6/FHJMJFBSRj8P9qvRZOgCaTmN/F/UkNjEEZlaZha1jzUCc9l oktOCt0gPX6EL2mU44TxSvyemdwuHGVks0cyZfkg2GNn5J7U0dOdQbKEBcDvNUVTZvME 4gRdhDI57o2AzSNWuZADtdQ0UJta8CASncNsV1YnuSqq/Al+seqEAQzk/MIkbu9E3xpR ckubHBN0Ih8OEU/rY4C+PpADZfaR+cszsJS4xPYEy3v46Usmq3dBy/liTba/tWRtkDrp a/yA== X-Gm-Message-State: AG10YOQaA3HYegExGh6HjPZZNwResCu5p84YyuLCFoNk/L32xZhlr/zPEtrlhbwpCP28lg== X-Received: by 10.50.43.170 with SMTP id x10mr13765409igl.48.1454380282894; Mon, 01 Feb 2016 18:31:22 -0800 (PST) Received: from localhost.localdomain (c-24-7-245-123.hsd1.mn.comcast.net. [24.7.245.123]) by smtp.gmail.com with ESMTPSA id f14sm340608ioi.20.2016.02.01.18.31.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Feb 2016 18:31:22 -0800 (PST) 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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,