Merge remote-tracking branch 'wireless-next/master'

[karo-tx-linux.git] / net / ipv6 / Kconfig

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 11b13ea69db4e6c35c8b992de9055bf6a312d802..e1a8d903e3662cb1aa36def1ffa5208cd6d515a8 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -153,6 +153,17 @@ config INET6_XFRM_MODE_ROUTEOPTIMIZATION
        ---help---
          Support for MIPv6 route optimization mode.
 
+config IPV6_VTI
+tristate "Virtual (secure) IPv6: tunneling"
+       select IPV6_TUNNEL
+       depends on INET6_XFRM_MODE_TUNNEL
+       ---help---
+       Tunneling means encapsulating data of one protocol type within
+       another protocol and sending it over a channel that understands the
+       encapsulating protocol. This can be used with xfrm mode tunnel to give
+       the notion of a secure tunnel for IPSEC and then use routing protocol
+       on top.
+
 config IPV6_SIT
        tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)"
        select INET_TUNNEL