diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-20 16:13:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-20 16:13:58 -0700 |
| commit | 38fe999e2286139cccdaa500a81bd49a16a81158 (patch) | |
| tree | 317cb01faf3c2fd08a908e694a61df27006f3fea /net | |
| parent | 607bfbf2d55dd1cfe5368b41c2a81a8c9ccf4723 (diff) | |
| download | linux-stable-38fe999e2286139cccdaa500a81bd49a16a81158.tar.gz linux-stable-38fe999e2286139cccdaa500a81bd49a16a81158.tar.bz2 linux-stable-38fe999e2286139cccdaa500a81bd49a16a81158.zip | |
[IPV6] KCONFIG: Fix description about IPV6_TUNNEL.
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 58219dfffef8..47263e45bacb 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -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. |