Re: [PATCH net-next] ip_vti: Fix unused variable warning

[Xin Long]

On Fri, Jul 31, 2020 at 2:50 PM YueHaibing <yuehaibing@xxxxxxxxxx> wrote:
>
> If CONFIG_INET_XFRM_TUNNEL is set but CONFIG_IPV6 is n,
>
> net/ipv4/ip_vti.c:493:27: warning: 'vti_ipip6_handler' defined but not used [-Wunused-variable]
>
> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
Fixes: 55a48c7ec75a ("ip_vti: not register vti_ipip_handler twice")
Acked-by: Xin Long <lucien.xin@xxxxxxxxx>

> ---
>  net/ipv4/ip_vti.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
> index 49daaed89764..f687abb069fa 100644
> --- a/net/ipv4/ip_vti.c
> +++ b/net/ipv4/ip_vti.c
> @@ -490,6 +490,7 @@ static struct xfrm_tunnel vti_ipip_handler __read_mostly = {
>         .priority       =       0,
>  };
>
> +#if IS_ENABLED(CONFIG_IPV6)
>  static struct xfrm_tunnel vti_ipip6_handler __read_mostly = {
>         .handler        =       vti_rcv_tunnel,
>         .cb_handler     =       vti_rcv_cb,
> @@ -497,6 +498,7 @@ static struct xfrm_tunnel vti_ipip6_handler __read_mostly = {
>         .priority       =       0,
>  };
>  #endif
> +#endif
>
>  static int __net_init vti_init_net(struct net *net)
>  {
> --
> 2.17.1
>
>