Instead of pre-computing the bitflag mask within the code generator, then generate the code to combine all the flags in the generated code. This patch uses the new p_wrap() method to wrap long lines. This IMHO makes the generated code read more like handwritten code. No functional changes. Signed-off-by: Asbjørn Sloth Tønnesen --- include/uapi/linux/netdev.h | 6 +++++- tools/include/uapi/linux/netdev.h | 6 +++++- tools/net/ynl/pyynl/ynl_gen_c.py | 7 +++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h index db0526cb6672d..337f444178bbb 100644 --- a/include/uapi/linux/netdev.h +++ b/include/uapi/linux/netdev.h @@ -35,7 +35,11 @@ enum netdev_xdp_act { NETDEV_XDP_ACT_NDO_XMIT_SG = 1U << 6, /* private: */ - NETDEV_XDP_ACT_MASK = 127, + NETDEV_XDP_ACT_MASK = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | + NETDEV_XDP_ACT_NDO_XMIT | + NETDEV_XDP_ACT_XSK_ZEROCOPY | + NETDEV_XDP_ACT_HW_OFFLOAD | NETDEV_XDP_ACT_RX_SG | + NETDEV_XDP_ACT_NDO_XMIT_SG, }; /** diff --git a/tools/include/uapi/linux/netdev.h b/tools/include/uapi/linux/netdev.h index db0526cb6672d..337f444178bbb 100644 --- a/tools/include/uapi/linux/netdev.h +++ b/tools/include/uapi/linux/netdev.h @@ -35,7 +35,11 @@ enum netdev_xdp_act { NETDEV_XDP_ACT_NDO_XMIT_SG = 1U << 6, /* private: */ - NETDEV_XDP_ACT_MASK = 127, + NETDEV_XDP_ACT_MASK = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | + NETDEV_XDP_ACT_NDO_XMIT | + NETDEV_XDP_ACT_XSK_ZEROCOPY | + NETDEV_XDP_ACT_HW_OFFLOAD | NETDEV_XDP_ACT_RX_SG | + NETDEV_XDP_ACT_NDO_XMIT_SG, }; /** diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen_c.py index 1201c2ac352ea..5e1c702143d86 100755 --- a/tools/net/ynl/pyynl/ynl_gen_c.py +++ b/tools/net/ynl/pyynl/ynl_gen_c.py @@ -3232,12 +3232,15 @@ def render_uapi(family, cw): cw.p('/* private: */') max_name = c_upper(enum.enum_max_name) if const['type'] == 'flags': - max_val = f'{enum.get_mask()},' + values = list(enum.entries.values()) + parts = [f'{val.c_name} |' for val in values[:-1]] + parts.append(f'{values[-1].c_name},') + cw.p_wrap(f'{max_name} = ', parts) else: cnt_name = c_upper(enum.enum_cnt_name) cw.p(f'{cnt_name},') max_val = f'({cnt_name} - 1)' - cw.p(f'{max_name} = {max_val}') + cw.p(f'{max_name} = {max_val}') cw.block_end(line=';') cw.nl() elif const['type'] == 'const': -- 2.51.0