commit 0807f59465b3c3424eebf2488c8cc7b45161e2a5
author Nicolas Dichtel <nicolas.dichtel@6wind.com> Tue Feb 04 17:00:27 2020 +0100
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thu Apr 02 17:20:34 2020 +0200
tree b2bcccc079011605c9bad3df42c392f6deead6f6
parent cc24d74e50d21050fa9e8dcee2ef6460dca0d798

vti[6]: fix packet tx through bpf_redirect() in XinY cases

commit f1ed10264ed6b66b9cd5e8461cffce69be482356 upstream.

I forgot the 4in6/6in4 cases in my previous patch. Let's fix them.

Fixes: 95224166a903 ("vti[6]: fix packet tx through bpf_redirect()")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

net/ipv4/Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index b54b3ca..4d265d4 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -298,6 +298,7 @@
 
 config NET_IPVTI
 	tristate "Virtual (secure) IP: tunneling"
+	depends on IPV6 || IPV6=n
 	select INET_TUNNEL
 	select NET_IP_TUNNEL
 	depends on INET_XFRM_MODE_TUNNEL