fou: dead build rule for fou6.o

fou: dead build rule for fou6.o

[Valentin Rothberg]

Hi Arnd,

your commit fabb13db448e ("fou: add Kconfig options for IPv6 support")
has shown up in today's linux-next. ./scripts/checkkconfigsymbols.py
warned because of the following statement in net/ipv6/Makefile:

+obj-$(CONFIG_NET_FOU_IPV6_TUNNELS) += fou6.o

The referenced Kconfig option does not exist, but I assume the right
option is 'IPV6_FOU_TUNNEL'?  In case yes, the modified #if block in
the commit could be removed (redundant check).

Best regards,
 Valentin

Re: fou: dead build rule for fou6.o

[Arnd Bergmann]

On Tuesday, May 31, 2016 8:25:40 AM CEST Valentin Rothberg wrote:
> Hi Arnd,
> 
> your commit fabb13db448e ("fou: add Kconfig options for IPv6 support")
> has shown up in today's linux-next. ./scripts/checkkconfigsymbols.py
> warned because of the following statement in net/ipv6/Makefile:
> 
> +obj-$(CONFIG_NET_FOU_IPV6_TUNNELS) += fou6.o

Thanks for the report, that was indeed a mistake.

> The referenced Kconfig option does not exist, but I assume the right
> option is 'IPV6_FOU_TUNNEL'?  In case yes, the modified #if block in
> the commit could be removed (redundant check).

It's supposed to be CONFIG_IPV6_FOU, not CONFIG_IPV6_FOU_TUNNEL.
I've put that into my randconfig builder now to see if I get any
other regressions with that. What happened here is that after my
incorrect patch, the file never got built, so I did not see build
errors either. However it is possible that I made another mistake
in the same patch and it needs more changes, so let me first check
if this one-line change works correctly.

	Arnd

Re: fou: dead build rule for fou6.o

[Arnd Bergmann]

On Tuesday, May 31, 2016 8:25:40 AM CEST Valentin Rothberg wrote:
> Hi Arnd,
> 
> your commit fabb13db448e ("fou: add Kconfig options for IPv6 support")
> has shown up in today's linux-next. ./scripts/checkkconfigsymbols.py
> warned because of the following statement in net/ipv6/Makefile:
> 
> +obj-$(CONFIG_NET_FOU_IPV6_TUNNELS) += fou6.o
> 
> The referenced Kconfig option does not exist, but I assume the right
> option is 'IPV6_FOU_TUNNEL'?  In case yes, the modified #if block in
> the commit could be removed (redundant check).

I found another mistake that was hidden by the one you found.
The option controlling the file is IPV6_TUNNEL, not INET6_TUNNEL.
I'm currently testing with the patch below to address both bugs.

	Arnd

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 994608263260..2343e4f2e0bf 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -239,7 +239,7 @@ config IPV6_FOU
 config IPV6_FOU_TUNNEL
 	tristate
 	default NET_FOU_IP_TUNNELS && IPV6_FOU
-	select INET6_TUNNEL
+	select IPV6_TUNNEL
 
 config IPV6_MULTIPLE_TABLES
 	bool "IPv6: Multiple Routing Tables"
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index d42ca3d1197f..6d8ea099213e 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -42,7 +42,7 @@ obj-$(CONFIG_IPV6_VTI) += ip6_vti.o
 obj-$(CONFIG_IPV6_SIT) += sit.o
 obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
 obj-$(CONFIG_IPV6_GRE) += ip6_gre.o
-obj-$(CONFIG_NET_FOU_IPV6_TUNNELS) += fou6.o
+obj-$(CONFIG_IPV6_FOU) += fou6.o
 
 obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o
 obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)

Re: fou: dead build rule for fou6.o

[Arnd Bergmann]

On Tuesday, May 31, 2016 8:25:40 AM CEST Valentin Rothberg wrote:
> Hi Arnd,
> 
> your commit fabb13db448e ("fou: add Kconfig options for IPv6 support")
> has shown up in today's linux-next. ./scripts/checkkconfigsymbols.py
> warned because of the following statement in net/ipv6/Makefile:
> 
> +obj-$(CONFIG_NET_FOU_IPV6_TUNNELS) += fou6.o
> 
> The referenced Kconfig option does not exist, but I assume the right
> option is 'IPV6_FOU_TUNNEL'?  In case yes, the modified #if block in
> the commit could be removed (redundant check).

Patch sent now.

	Arnd