]> err.no Git - linux-2.6/commitdiff
[IPV6] KCONFIG: Fix description about IPV6_TUNNEL.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Thu, 20 Mar 2008 23:13:58 +0000 (16:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Mar 2008 23:13:58 +0000 (16:13 -0700)
Based on notice from "Colin" <colins@sjtu.edu.cn>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/Kconfig

index 58219dfffef8a499c4508181ccdd0cf13a8af49b..47263e45bacb930227a077b65daf10e217a50cfe 100644 (file)
@@ -179,11 +179,12 @@ config IPV6_SIT
          Saying M here will produce a module called sit.ko. If unsure, say Y.
 
 config IPV6_TUNNEL
-       tristate "IPv6: IPv6-in-IPv6 tunnel"
+       tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)"
        select INET6_TUNNEL
        depends on IPV6
        ---help---
-         Support for IPv6-in-IPv6 tunnels described in RFC 2473.
+         Support for IPv6-in-IPv6 and IPv4-in-IPv6 tunnels described in
+         RFC 2473.
 
          If unsure, say N.