1 files changed, 26 insertions, 15 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 47263e45bacb..42814a2ec9d7 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -3,7 +3,7 @@
 #
 
 #   IPv6 as module will cause a CRASH if you try to unload it
-config IPV6
+menuconfig IPV6
         tristate "The IPv6 protocol"
         default m
         ---help---
@@ -19,9 +19,10 @@ config IPV6
           To compile this protocol support as a module, choose M here: the 
           module will be called ipv6.
 
+if IPV6
+
 config IPV6_PRIVACY
         bool "IPv6: Privacy Extensions support"
-        depends on IPV6
         ---help---
           Privacy Extensions for Stateless Address Autoconfiguration in IPv6
           support.  With this option, additional periodically-alter 
@@ -40,7 +41,6 @@ config IPV6_PRIVACY
 
 config IPV6_ROUTER_PREF
         bool "IPv6: Router Preference (RFC 4191) support"
-        depends on IPV6
         ---help---
           Router Preference is an optional extension to the Router
           Advertisement message to improve the ability of hosts
@@ -59,7 +59,7 @@ config IPV6_ROUTE_INFO
 
 config IPV6_OPTIMISTIC_DAD
         bool "IPv6: Enable RFC 4429 Optimistic DAD (EXPERIMENTAL)"
-        depends on IPV6 && EXPERIMENTAL
+        depends on EXPERIMENTAL
         ---help---
           This is experimental support for optimistic Duplicate
           Address Detection.  It allows for autoconfigured addresses
@@ -69,7 +69,6 @@ config IPV6_OPTIMISTIC_DAD
 
 config INET6_AH
         tristate "IPv6: AH transformation"
-        depends on IPV6
         select XFRM
         select CRYPTO
         select CRYPTO_HMAC
@@ -82,7 +81,6 @@ config INET6_AH
 
 config INET6_ESP
         tristate "IPv6: ESP transformation"
-        depends on IPV6
         select XFRM
         select CRYPTO
         select CRYPTO_AUTHENC
@@ -98,7 +96,6 @@ config INET6_ESP
 
 config INET6_IPCOMP
         tristate "IPv6: IPComp transformation"
-        depends on IPV6
         select XFRM
         select INET6_XFRM_TUNNEL
         select CRYPTO
@@ -111,7 +108,7 @@ config INET6_IPCOMP
 
 config IPV6_MIP6
         tristate "IPv6: Mobility (EXPERIMENTAL)"
-        depends on IPV6 && EXPERIMENTAL
+        depends on EXPERIMENTAL
         select XFRM
         ---help---
           Support for IPv6 Mobility described in RFC 3775.
@@ -129,7 +126,6 @@ config INET6_TUNNEL
 
 config INET6_XFRM_MODE_TRANSPORT
         tristate "IPv6: IPsec transport mode"
-        depends on IPV6
         default IPV6
         select XFRM
         ---help---
@@ -139,7 +135,6 @@ config INET6_XFRM_MODE_TRANSPORT
 
 config INET6_XFRM_MODE_TUNNEL
         tristate "IPv6: IPsec tunnel mode"
-        depends on IPV6
         default IPV6
         select XFRM
         ---help---
@@ -149,7 +144,6 @@ config INET6_XFRM_MODE_TUNNEL
 
 config INET6_XFRM_MODE_BEET
         tristate "IPv6: IPsec BEET mode"
-        depends on IPV6
         default IPV6
         select XFRM
         ---help---
@@ -159,15 +153,15 @@ config INET6_XFRM_MODE_BEET
 
 config INET6_XFRM_MODE_ROUTEOPTIMIZATION
         tristate "IPv6: MIPv6 route optimization mode (EXPERIMENTAL)"
-        depends on IPV6 && EXPERIMENTAL
+        depends on EXPERIMENTAL
         select XFRM
         ---help---
           Support for MIPv6 route optimization mode.
 
 config IPV6_SIT
         tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)"
-        depends on IPV6
         select INET_TUNNEL
+        select IPV6_NDISC_NODETYPE
         default y
         ---help---
           Tunneling means encapsulating data of one protocol type within
@@ -178,10 +172,12 @@ config IPV6_SIT
 
           Saying M here will produce a module called sit.ko. If unsure, say Y.
 
+config IPV6_NDISC_NODETYPE
+        bool
+
 config IPV6_TUNNEL
         tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)"
         select INET6_TUNNEL
-        depends on IPV6
         ---help---
           Support for IPv6-in-IPv6 and IPv4-in-IPv6 tunnels described in
           RFC 2473.
@@ -190,7 +186,7 @@ config IPV6_TUNNEL
 
 config IPV6_MULTIPLE_TABLES
         bool "IPv6: Multiple Routing Tables"
-        depends on IPV6 && EXPERIMENTAL
+        depends on EXPERIMENTAL
         select FIB_RULES
         ---help---
           Support multiple routing tables.
@@ -209,3 +205,18 @@ config IPV6_SUBTREES
 
           If unsure, say N.
 
+config IPV6_MROUTE
+        bool "IPv6: multicast routing (EXPERIMENTAL)"
+        depends on IPV6 && EXPERIMENTAL
+        ---help---
+          Experimental support for IPv6 multicast forwarding.
+          If unsure, say N.
+
+config IPV6_PIMSM_V2
+        bool "IPv6: PIM-SM version 2 support (EXPERIMENTAL)"
+        depends on IPV6_MROUTE
+        ---help---
+          Support for IPv6 PIM multicast routing protocol PIM-SMv2.
+          If unsure, say N.
+
+endif # IPV6