Merge branch 'for-2.6.26' of git://neil.brown.name/md

[pandora-kernel.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index ab4e6da..acbf7c6 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.


@@ -45,7 +45,7 @@ config INET
        ---help---
          These are the protocols used on the Internet and on most local
          Ethernets. It is highly recommended to say Y here (this will enlarge
        ---help---
          These are the protocols used on the Internet and on most local
          Ethernets. It is highly recommended to say Y here (this will enlarge

-         your kernel by about 144 KB), since some programs (e.g. the X window
+         your kernel by about 400 KB), since some programs (e.g. the X window

          system) use TCP/IP even if your machine is not connected to any
          other computer. You will get the so-called loopback device which
          allows you to ping yourself (great fun, that!).
          system) use TCP/IP even if your machine is not connected to any
          other computer. You will get the so-called loopback device which
          allows you to ping yourself (great fun, that!).


@@ -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"