Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200731064952.36900-1-yuehaibing@huawei.com>
In-Reply-To: <20200731064952.36900-1-yuehaibing@huawei.com>
From:   Xin Long <lucien.xin@gmail.com>
Date:   Fri, 31 Jul 2020 15:28:26 +0800
Message-ID: <CADvbK_c8LtT1Jfbf4h1HrAC4p9wGproDgDieSV-roSWEEN=M0A@mail.gmail.com>
Subject: Re: [PATCH net-next] ip_vti: Fix unused variable warning
To:     YueHaibing <yuehaibing@huawei.com>
Cc:     Steffen Klassert <steffen.klassert@secunet.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        davem <davem@davemloft.net>, kuznet <kuznet@ms2.inr.ac.ru>,
        yoshfuji <yoshfuji@linux-ipv6.org>,
        Jakub Kicinski <kuba@kernel.org>,
        network dev <netdev@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, Jul 31, 2020 at 2:50 PM YueHaibing <yuehaibing@huawei.com> 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@huawei.com>
Fixes: 55a48c7ec75a ("ip_vti: not register vti_ipip_handler twice")
Acked-by: Xin Long <lucien.xin@gmail.com>

> ---
>  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
>
>