| Message ID | 20200731064952.36900-1-yuehaibing@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] ip_vti: Fix unused variable warning | expand |
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 > >
From: YueHaibing <yuehaibing@huawei.com> Date: Fri, 31 Jul 2020 14:49:52 +0800 > 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> Steffen, please pick this up if you haven't already. Thank you.
On Mon, Aug 03, 2020 at 03:13:49PM -0700, David Miller wrote: > From: YueHaibing <yuehaibing@huawei.com> > Date: Fri, 31 Jul 2020 14:49:52 +0800 > > > 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> > > Steffen, please pick this up if you haven't already. I still have this one in my queue, it came in after I did the the ipsec-next pull request last week. Now the 5.8 release was inbetween, so it should go to the ipsec tree. I'm waiting until I can backmerge the offending patch into the ipsec tree and apply it then. Alternatively to speed things up, you can take it directly into net-next before you do the pull request to Linus. In case you prefer that: Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
From: Steffen Klassert <steffen.klassert@secunet.com> Date: Tue, 4 Aug 2020 07:53:10 +0200 > On Mon, Aug 03, 2020 at 03:13:49PM -0700, David Miller wrote: >> From: YueHaibing <yuehaibing@huawei.com> >> Date: Fri, 31 Jul 2020 14:49:52 +0800 >> >> > 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> >> >> Steffen, please pick this up if you haven't already. > > I still have this one in my queue, it came in after > I did the the ipsec-next pull request last week. > Now the 5.8 release was inbetween, so it should go > to the ipsec tree. I'm waiting until I can backmerge > the offending patch into the ipsec tree and apply it > then. I can wait until you can get it to me via your tree, no problem.
On Fri, Jul 31, 2020 at 02:49:52PM +0800, YueHaibing 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> Now applied to the ipsec tree, thanks!
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) {
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> --- net/ipv4/ip_vti.c | 2 ++ 1 file changed, 2 insertions(+)