linux-next: build warning after merge of the net-next tree

Hi all,

After merging the net-next tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning (CONFIG_MPLS is disabled):

net/ipv4/tunnel4.c: In function 'tunnel4_init':
net/ipv4/tunnel4.c:223:1: warning: label 'err_mpls' defined but not used [-Wunused-label]
 err_mpls:
 ^

and the powerpc ppc64_defconfig build produced this (CONFIG_IPV6 is disabled):

net/ipv4/tunnel4.c: In function 'tunnel4_init':
net/ipv4/tunnel4.c:226:1: warning: label 'err_ipv6' defined but not used [-Wunused-label]
 err_ipv6:
 ^

Introduced by commit

  8afe97e5d416 ("tunnels: support MPLS over IPv4 tunnels")

-- 
Cheers,
Stephen Rothwell

On Mon, Jul 11, 2016 at 04:13:11PM +1000, Stephen Rothwell wrote:

Hi all,

After merging the net-next tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning (CONFIG_MPLS is disabled):

net/ipv4/tunnel4.c: In function 'tunnel4_init':
net/ipv4/tunnel4.c:223:1: warning: label 'err_mpls' defined but not used [-Wunused-label]
 err_mpls:
 ^

and the powerpc ppc64_defconfig build produced this (CONFIG_IPV6 is disabled):

net/ipv4/tunnel4.c: In function 'tunnel4_init':
net/ipv4/tunnel4.c:226:1: warning: label 'err_ipv6' defined but not used [-Wunused-label]
 err_ipv6:
 ^

Introduced by commit

  8afe97e5d416 ("tunnels: support MPLS over IPv4 tunnels")

Thanks Stephen,

I have posted a fix for this.

"[PATCH net-next v2] tunnels: correct conditional build of MPLS and IPv6"