[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20230710171310.GA671729@pevik>
Date: Mon, 10 Jul 2023 19:13:10 +0200
From: Petr Vorel <pvorel@...e.cz>
To: Masahiro Yamada <masahiroy@...nel.org>
Cc: linux-kernel@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>, sam@...nborg.org,
Ruben Ayrapetyan <ruben.ayrapetyan@....com>,
Kevin Brodsky <kevin.brodsky@....com>
Subject: Re: [PATCH v2] uapi/netfilter: Prefer ISO-friendly __typeof__
> On Thu, May 4, 2023 at 10:36 AM Petr Vorel <pvorel@...e.cz> wrote:
> > typeof() is a GNU extension, UAPI requires ISO C, therefore __typeof__()
> > should be used. Similarly to 31088f6f7906 ("uapi/linux/const.h: Prefer
> > ISO-friendly __typeof__") use __typeof__() also in x_tables.h.
> > Fixes: 72b2b1dd77e8 ("netfilter: xtables: replace XT_ENTRY_ITERATE macro")
> > Reviewed-by: Kevin Brodsky <kevin.brodsky@....com>
> > Signed-off-by: Petr Vorel <pvorel@...e.cz>
> Reviewed-by: Masahiro Yamada <masahiroy@...nel.org>
Hi Andrew,
gently ping, could you please merge this to next tree?
Or do we need to wait to next merge window?
Kind regards,
Petr
> > ---
> > Changes v1->v2:
> > * Add Kevin's Reviewed-by:
> > https://lore.kernel.org/lkml/f8bd4212-9cca-03ca-884a-c9dec63bb256@arm.com/
> > * Update hash to 31088f6f7906 (Kevin)
> > * Add Fixes: 72b2b1dd77e8 (Kevin)
> > include/uapi/linux/netfilter/x_tables.h | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> > diff --git a/include/uapi/linux/netfilter/x_tables.h b/include/uapi/linux/netfilter/x_tables.h
> > index 796af83a963a..d4eced07f2a2 100644
> > --- a/include/uapi/linux/netfilter/x_tables.h
> > +++ b/include/uapi/linux/netfilter/x_tables.h
> > @@ -172,11 +172,11 @@ struct xt_counters_info {
> > /* pos is normally a struct ipt_entry/ip6t_entry/etc. */
> > #define xt_entry_foreach(pos, ehead, esize) \
> > - for ((pos) = (typeof(pos))(ehead); \
> > - (pos) < (typeof(pos))((char *)(ehead) + (esize)); \
> > - (pos) = (typeof(pos))((char *)(pos) + (pos)->next_offset))
> > + for ((pos) = (__typeof__(pos))(ehead); \
> > + (pos) < (__typeof__(pos))((char *)(ehead) + (esize)); \
> > + (pos) = (__typeof__(pos))((char *)(pos) + (pos)->next_offset))
> > -/* can only be xt_entry_match, so no use of typeof here */
> > +/* can only be xt_entry_match, so no use of __typeof__ here */
> > #define xt_ematch_foreach(pos, entry) \
> > for ((pos) = (struct xt_entry_match *)entry->elems; \
> > (pos) < (struct xt_entry_match *)((char *)(entry) + \
> > --
> > 2.40.0
Powered by blists - more mailing lists