Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 2073226a8a63996dea73a90473182eb7b4a17332..8603ca82710415b24e8ff85cbce1e45ba34491d2 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -166,6 +166,7 @@ config IP_PNP_RARP
 config NET_IPIP
        tristate "IP: tunneling"
        select INET_TUNNEL
+       select NET_IP_TUNNEL
        ---help---
          Tunneling means encapsulating data of one protocol type within
          another protocol and sending it over a channel that understands the
@@ -318,6 +319,7 @@ config SYN_COOKIES
 config NET_IPVTI
        tristate "Virtual (secure) IP: tunneling"
        select INET_TUNNEL
+       select NET_IP_TUNNEL
        depends on INET_XFRM_MODE_TUNNEL
        ---help---
          Tunneling means encapsulating data of one protocol type within