Re: [PATCH 03/11 net-next v4] ipv6: replace IS_BUILTIN(CONFIG_IPV6) with IS_ENABLED(CONFIG_IPV6)
From: Ido Schimmel
Date: Mon Mar 23 2026 - 16:14:04 EST
On Fri, Mar 20, 2026 at 07:55:55PM +0100, Fernando Fernandez Mancera wrote:
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index 08cd86f49bf9..c442ac275f58 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -6826,7 +6826,7 @@ void __init ip6_route_init_special_entries(void)
> #endif
> }
>
> -#if IS_BUILTIN(CONFIG_IPV6)
> +#if IS_ENABLED(CONFIG_IPV6)
Can't this be removed?
> #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS)
> DEFINE_BPF_ITER_FUNC(ipv6_route, struct bpf_iter_meta *meta, struct fib6_info *rt)
>
> @@ -6921,7 +6921,7 @@ int __init ip6_route_init(void)
> if (ret)
> goto out_register_late_subsys;
>
> -#if IS_BUILTIN(CONFIG_IPV6)
> +#if IS_ENABLED(CONFIG_IPV6)
Same question.
I will try to go over the rest of the patches tomorrow morning.
> #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS)
> ret = bpf_iter_register();
> if (ret)
> @@ -6961,10 +6961,8 @@ int __init ip6_route_init(void)
>
> void ip6_route_cleanup(void)
> {
> -#if IS_BUILTIN(CONFIG_IPV6)
> #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS)
> bpf_iter_unregister();
> -#endif
> #endif
> unregister_netdevice_notifier(&ip6_route_dev_notifier);
> unregister_pernet_subsys(&ip6_route_net_late_ops);
> --
> 2.53.0
>