| Message ID | 1454380257-27195-1-git-send-email-ebiggers3@gmail.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
Eric Biggers <ebiggers3@gmail.com> wrote: > This eliminates an "unused function" compiler warning when > CONFIG_NF_CONNTRACK_LABELS is not defined. > > Signed-off-by: Eric Biggers <ebiggers3@gmail.com> The nft_ct_get_eval_counter call should've been unconditional. The #endif placement is wrong: https://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit?id=efaea94aaf0decd55b15aa7068d4d516a352e56e
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,
This eliminates an "unused function" compiler warning when CONFIG_NF_CONNTRACK_LABELS is not defined. Signed-off-by: Eric Biggers <ebiggers3@gmail.com> --- net/netfilter/nft_ct.c | 2 ++ 1 file changed, 2 insertions(+)