[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240918183708.GA1044577@kernel.org>
Date: Wed, 18 Sep 2024 19:37:08 +0100
From: Simon Horman <horms@...nel.org>
To: Pablo Neira Ayuso <pablo@...filter.org>
Cc: Jozsef Kadlecsik <kadlec@...filter.org>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Bill Wendling <morbo@...gle.com>,
Justin Stitt <justinstitt@...gle.com>,
netfilter-devel@...r.kernel.org, coreteam@...filter.org,
netdev@...r.kernel.org, llvm@...ts.linux.dev
Subject: Re: [PATCH nf-next 0/2] netfilter: conntrack: label helpers
conditional compilation updates
On Wed, Sep 18, 2024 at 01:52:14PM +0200, Pablo Neira Ayuso wrote:
> On Mon, Sep 16, 2024 at 04:14:40PM +0100, Simon Horman wrote:
> > Hi,
> >
> > This short series updates conditional compilation of label helpers to:
> >
> > 1) Compile them regardless of if CONFIG_NF_CONNTRACK_LABELS is enabled
> > or not. It is safe to do so as the functions will always return 0 if
> > CONFIG_NF_CONNTRACK_LABELS is not enabled. And the compiler should
> > optimise waway the code. Which is the desired behaviour.
> >
> > 2) Only compile ctnetlink_label_size if CONFIG_NF_CONNTRACK_EVENTS is
> > enabled. This addresses a warning about this function being unused
> > in this case.
>
> Patch 1)
>
> -#ifdef CONFIG_NF_CONNTRACK_LABELS
> static inline int ctnetlink_label_size(const struct nf_conn *ct)
>
> Patch 2)
>
> +#ifdef CONFIG_NF_CONNTRACK_EVENTS
> static inline int ctnetlink_label_size(const struct nf_conn *ct)
>
> They both refer to ctnetlink_label_size(), #ifdef check is not
> correct.
>
> Would you mind if I collapsed these two patches before applying?
Sure, no problem.
Powered by blists - more mailing lists