From patchwork Wed Jan 13 13:58:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101180 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3382236lbb; Wed, 13 Jan 2016 06:04:02 -0800 (PST) X-Received: by 10.66.102.73 with SMTP id fm9mr144112506pab.32.1452693842628; Wed, 13 Jan 2016 06:04:02 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n2si2223396pap.201.2016.01.13.06.04.02; Wed, 13 Jan 2016 06:04:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934559AbcAMOEA (ORCPT + 29 others); Wed, 13 Jan 2016 09:04:00 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:52807 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932350AbcAMOD6 (ORCPT ); Wed, 13 Jan 2016 09:03:58 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0MTcE0-1ajiTf1RKa-00QROK; Wed, 13 Jan 2016 14:58:15 +0100 From: Arnd Bergmann To: Pablo Neira Ayuso Cc: Patrick McHardy , Jozsef Kadlecsik , "David S. Miller" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Florian Westphal Subject: [PATCH] netfilter: nft_ct: mark nft_ct_get_eval_counter __maybe_unused Date: Wed, 13 Jan 2016 14:58:11 +0100 Message-ID: <6200241.eeH6DHXzHj@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:Ag1YVjwQOu5CYLXerBuYpbIm4T2TsgnH0AIrfWcg9/80HRMC0cf fuqzcqglk0AjziPbAkHc6FJe3asavlRBLdWi4QrLHjdd24F4vmkIft0sC3Ox+MSkNTT6C4X w96Qzrs57YUYPFwT1n1NOUlv6BVna51PbUrZ2F5ZZR2uoZC8MNI4cEz9Qi91LsHGrFC7I1l uKBQL+qkrk8U7kQqnUrIg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Br89wWai2iM=:tENbCW7nB8vsRqdB2eFEx3 Tcz1OudK+z8s9JddeXkfjmqBQ+bGQbrYxDrR+2Vxw3y7G0tMheLj7Xj1xv+HczSVzn57sbJNp 59RpnSGeD/iJ3Yy1q3xZm/V/UMOMGRaWxgJcaAmTkg+vEtfrDTc8I3x0pUkxYp19U4fin3SEA nNqOdZnXSOumiYzzGSgJghArcPyqRs26tMfp+mLf9OVzMuddbM8w7d1QxvbSEKg0qRFuEbjDt 3oe6LVnAeNBAmWi67aDEBx1Fn1H2Qb6SniT2AgfTrU1WoSs3wlS8cdiCvqKpgnTFnFp8tKJRV kqPjQgpniSPJqzLsOepvvyDi2wymOqD4NAPonj6SgE3E9XUstOZw/mOTq3+y4uvEUHYxSKABj S/AEf0VFr5fxYimIYO22TuKFCiW4rk2kUVOSmNun9P/oQB/ulc3x2/hWa9v+qITkTE6DTGoI+ 0PpdtaAyKcQEsy/UIrFuNnXcRa80eH0x6yYWlxsW4KA9MlKtXujzjI4y26Af+3T2PVmJ8eQw9 eUfaIqcKlPLCNu6cv74FCjrkYF0H1T7cp/UhjCUe1D3HnixlRAG6A0ZyLCx/zm9qZmi9N0BhK S0FtW4hNsGbcO//gMGY5kzz7CCOZUxZsFm5uuSSJTeJbsYd8mXK+eB+6wWbkMvrNPx3dfRGTi +M0CLziBP6KjECkdJaISp+PnhWMIKaTUVH0Oz1Gc3+hpqnK98GZTW3JzoC7Cukbsoz4726toG Pke+alyce1ekU7QH Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added nft_ct_get_eval_counter() function is only used when CONFIG_NF_CONNTRACK_LABELS is set, otherwise gcc warns about the unused definition: netfilter/nft_ct.c:34:12: warning: 'nft_ct_get_eval_counter' defined but not used [-Wunused-function] static u64 nft_ct_get_eval_counter(const struct nf_conn_counter *c, This marks the function __maybe_unused to shut up the warning. Signed-off-by: Arnd Bergmann Fixes: 48f66c905a97 ("netfilter: nft_ct: add byte/packet counter support") --- Found on ARM randconfig builds this week diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index a0eb2161e3ef..3496929bbc54 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -31,9 +31,9 @@ struct nft_ct { }; }; -static u64 nft_ct_get_eval_counter(const struct nf_conn_counter *c, - enum nft_ct_keys k, - enum ip_conntrack_dir d) +static u64 __maybe_unused nft_ct_get_eval_counter(const struct nf_conn_counter *c, + enum nft_ct_keys k, + enum ip_conntrack_dir d) { if (d < IP_CT_DIR_MAX) return k == NFT_CT_BYTES ? atomic64_read(&c[d].bytes) :