Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

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

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 643f61339e7b4fc9d4dcba75c4bb772c99d39292..983bb999738c4dbe1c6b084f5cc75da7d14b1543 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -92,6 +92,25 @@ config IPV6_MIP6
 
          If unsure, say N.
 
+config IPV6_ILA
+       tristate "IPv6: Identifier Locator Addressing (ILA)"
+       select LWTUNNEL
+       ---help---
+         Support for IPv6 Identifier Locator Addressing (ILA).
+
+         ILA is a mechanism to do network virtualization without
+         encapsulation. The basic concept of ILA is that we split an
+         IPv6 address into a 64 bit locator and 64 bit identifier. The
+         identifier is the identity of an entity in communication
+         ("who") and the locator expresses the location of the
+         entity ("where").
+
+         ILA can be configured using the "encap ila" option with
+         "ip -6 route" command. ILA is described in
+         https://tools.ietf.org/html/draft-herbert-nvo3-ila-00.
+
+         If unsure, say N.
+
 config INET6_XFRM_TUNNEL
        tristate
        select INET6_TUNNEL