Re: [PATCH nf-next] netfilter: use `NFPROTO_*` constants in "nf-logger-" module aliasses

[Jeremy Sowden <jeremy@xxxxxxxxxx>]

On 2025-04-20, at 20:15:40 +0100, Jeremy Sowden wrote:
> The nf_log_syslog and nfnetlink_log modules define module aliasses of the
> form:
>
>     nf-logger-${family}-${type}
>
> The family arguments passed to the `MODULE_ALIAS_NF_LOGGER` macro are a
> mixture of `AF_*` constants for families where these exist and integer
> literals for the rest.  In some of the latter cases, there are comments
> containing the related `NFPROTO_*` constants.
>
> Since there are `NFPROTO_*` for all families, use them throughout.

Please ignore: the `NFPROTO_*` constants are enum values, not macros, so
this doesn't work.

J.

> Signed-off-by: Jeremy Sowden <jeremy@xxxxxxxxxx>
> ---
>  net/netfilter/nf_log_syslog.c | 10 +++++-----
>  net/netfilter/nfnetlink_log.c | 10 +++++-----
>  2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c
> index 86d5fc5d28e3..b2463e5013b6 100644
> --- a/net/netfilter/nf_log_syslog.c
> +++ b/net/netfilter/nf_log_syslog.c
> @@ -1078,8 +1078,8 @@ MODULE_ALIAS("nf_log_bridge");
>  MODULE_ALIAS("nf_log_ipv4");
>  MODULE_ALIAS("nf_log_ipv6");
>  MODULE_ALIAS("nf_log_netdev");
> -MODULE_ALIAS_NF_LOGGER(AF_BRIDGE, 0);
> -MODULE_ALIAS_NF_LOGGER(AF_INET, 0);
> -MODULE_ALIAS_NF_LOGGER(3, 0);
> -MODULE_ALIAS_NF_LOGGER(5, 0); /* NFPROTO_NETDEV */
> -MODULE_ALIAS_NF_LOGGER(AF_INET6, 0);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_BRIDGE, 0);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_IPV4, 0);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_ARP, 0);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_NETDEV, 0);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_IPV6, 0);
> diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
> index 134e05d31061..03e3560eaa51 100644
> --- a/net/netfilter/nfnetlink_log.c
> +++ b/net/netfilter/nfnetlink_log.c
> @@ -1207,11 +1207,11 @@ MODULE_DESCRIPTION("netfilter userspace logging");
>  MODULE_AUTHOR("Harald Welte <laforge@xxxxxxxxxxxxx>");
>  MODULE_LICENSE("GPL");
>  MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_ULOG);
> -MODULE_ALIAS_NF_LOGGER(AF_INET, 1);
> -MODULE_ALIAS_NF_LOGGER(AF_INET6, 1);
> -MODULE_ALIAS_NF_LOGGER(AF_BRIDGE, 1);
> -MODULE_ALIAS_NF_LOGGER(3, 1); /* NFPROTO_ARP */
> -MODULE_ALIAS_NF_LOGGER(5, 1); /* NFPROTO_NETDEV */
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_IPV4, 1);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_IPV6, 1);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_BRIDGE, 1);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_ARP, 1);
> +MODULE_ALIAS_NF_LOGGER(NFPROTO_NETDEV, 1);
>
>  module_init(nfnetlink_log_init);
>  module_exit(nfnetlink_log_fini);
> --
> 2.47.2

Attachment: signature.asc
Description: PGP signature