Subash Abhinov Kasiviswanathan <subashab@xxxxxxxxxxxxxx> wrote:
> CONFIG_NF_CONNTRACK_IPV6 has been deprecated so replace it with
> a check for IPV6 instead.
Right, I missed this part somehow.
> Fixes: a0ae2562c6c4b2 ("netfilter: conntrack: remove l3proto abstraction")
> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@xxxxxxxxxxxxxx>
> ---
> include/linux/netfilter_ipv6.h | 2 +-
> net/netfilter/nf_conntrack_h323_main.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
> index 12113e5..61f7ac9 100644
> --- a/include/linux/netfilter_ipv6.h
> +++ b/include/linux/netfilter_ipv6.h
> @@ -25,7 +25,7 @@ struct ip6_rt_info {
> * if IPv6 is a module.
> */
> struct nf_ipv6_ops {
> -#if IS_MODULE(CONFIG_IPV6)
> +#if IS_ENABLED(CONFIG_IPV6)
I would prefer if we could keep this as IS_ENABLED().
> diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
> index 005589c..1c6769b 100644
> --- a/net/netfilter/nf_conntrack_h323_main.c
> +++ b/net/netfilter/nf_conntrack_h323_main.c
> @@ -748,7 +748,7 @@ static int callforward_do_filter(struct net *net,
> }
> break;
> }
> -#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
> +#if IS_ENABLED(CONFIG_IPV6)
> case AF_INET6: {
> const struct nf_ipv6_ops *v6ops;
> struct rt6_info *rt1, *rt2;
This branch should use nf_ip6_route() instead of v6ops->route().
