[PATCH] netfilter: nft_ct: mark nft_ct_get_eval_counter __maybe_unused

[PATCH] netfilter: nft_ct: mark nft_ct_get_eval_counter __maybe_unused

[Arnd Bergmann]

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 <arnd@arndb.de>
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) :

Re: [PATCH] netfilter: nft_ct: mark nft_ct_get_eval_counter __maybe_unused

[Pablo Neira Ayuso]

On Wed, Jan 13, 2016 at 02:58:11PM +0100, Arnd Bergmann wrote:
> 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.

It seems that function doesn't below to CONFIG_NF_CONNTRACK_LABELS as
it is part of the new counter support. Will be sending an alternate
patch instead.

Thanks anyway for your patch Arnd.

Re: [PATCH] netfilter: nft_ct: mark nft_ct_get_eval_counter __maybe_unused

[Pablo Neira Ayuso]

On Wed, Jan 13, 2016 at 04:54:24PM +0100, Pablo Neira Ayuso wrote:
> On Wed, Jan 13, 2016 at 02:58:11PM +0100, Arnd Bergmann wrote:
> > 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.
> 
> It seems that function doesn't below to CONFIG_NF_CONNTRACK_LABELS as
> it is part of the new counter support. Will be sending an alternate
> patch instead.

Just for the record, I submitted this fix:

http://patchwork.ozlabs.org/patch/567063/