namespaces: mark NET_NS with "depends on NAMESPACES"

[linux-2.6] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index ab4e6da5012f1e1d2ef45436fa863d80655f75e2..6627c6ae5db682a77ff92a8bb0cf577c69c32fac 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -30,7 +30,7 @@ menu "Networking options"
 config NET_NS
        bool "Network namespace support"
        default n
 config NET_NS
        bool "Network namespace support"
        default n

-       depends on EXPERIMENTAL && !SYSFS
+       depends on EXPERIMENTAL && !SYSFS && NAMESPACES

        help
          Allow user space to create what appear to be multiple instances
          of the network stack.
        help
          Allow user space to create what appear to be multiple instances
          of the network stack.


@@ -144,9 +144,21 @@ config NETFILTER_DEBUG
          You can say Y here if you want to get additional messages useful in
          debugging the netfilter code.
 
          You can say Y here if you want to get additional messages useful in
          debugging the netfilter code.
 

+config NETFILTER_ADVANCED
+       bool "Advanced netfilter configuration"
+       depends on NETFILTER
+       default y
+       help
+         If you say Y here you can select between all the netfilter modules.
+         If you say N the more ununsual ones will not be shown and the
+         basic ones needed by most people will default to 'M'.
+
+         If unsure, say Y.
+

 config BRIDGE_NETFILTER
        bool "Bridged IP/ARP packets filtering"
        depends on BRIDGE && NETFILTER && INET
 config BRIDGE_NETFILTER
        bool "Bridged IP/ARP packets filtering"
        depends on BRIDGE && NETFILTER && INET

+       depends on NETFILTER_ADVANCED

        default y
        ---help---
          Enabling this option will let arptables resp. iptables see bridged
        default y
        ---help---
          Enabling this option will let arptables resp. iptables see bridged


@@ -218,6 +230,7 @@ endmenu
 endmenu
 
 source "net/ax25/Kconfig"
 endmenu
 
 source "net/ax25/Kconfig"

+source "net/can/Kconfig"

 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"