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 438a73aa777cf560f38a87801b03b8ce20a315b1..983bb999738c4dbe1c6b084f5cc75da7d14b1543 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -5,16 +5,15 @@
 #   IPv6 as module will cause a CRASH if you try to unload it
 menuconfig IPV6
        tristate "The IPv6 protocol"
-       default m
+       default y
        ---help---
-         This is complemental support for the IP version 6.
-         You will still be able to do traditional IPv4 networking as well.
+         Support for IP version 6 (IPv6).
 
          For general information about IPv6, see
          <https://en.wikipedia.org/wiki/IPv6>.
-         For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
-         For specific information about IPv6 under Linux, read the HOWTO at
-         <http://www.bieringer.de/linux/IPv6/>.
+         For specific information about IPv6 under Linux, see
+         Documentation/networking/ipv6.txt and read the HOWTO at
+         <http://www.tldp.org/HOWTO/Linux+IPv6-HOWTO/>
 
          To compile this protocol support as a module, choose M here: the 
          module will be called ipv6.
@@ -93,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