rds: Fix NULL pointer dereference in __rds_rdma_map

[pandora-kernel.git] / net / decnet / Kconfig

diff --git a/net/decnet/Kconfig b/net/decnet/Kconfig
index 2101da5..7914fd6 100644 (file)
--- a/net/decnet/Kconfig
+++ b/net/decnet/Kconfig
@@ -1,9 +1,33 @@
 #
 # DECnet configuration
 #
+config DECNET
+       tristate "DECnet Support"
+       ---help---
+         The DECnet networking protocol was used in many products made by
+         Digital (now Compaq).  It provides reliable stream and sequenced
+         packet communications over which run a variety of services similar
+         to those which run over TCP/IP.
+
+         To find some tools to use with the kernel layer support, please
+         look at Patrick Caulfield's web site:
+         <http://linux-decnet.sourceforge.net/>.
+
+         More detailed documentation is available in
+         <file:Documentation/networking/decnet.txt>.
+
+         Be sure to say Y to "/proc file system support" and "Sysctl support"
+         below when using DECnet, since you will need sysctl support to aid
+         in configuration at run time.
+
+         The DECnet code is also available as a module ( = code which can be
+         inserted in and removed from the running kernel whenever you want).
+         The module is called decnet.
+
 config DECNET_ROUTER
        bool "DECnet: router support (EXPERIMENTAL)"
        depends on DECNET && EXPERIMENTAL
+       select FIB_RULES
        ---help---
          Add support for turning your DECnet Endnode into a level 1 or 2
          router.  This is an experimental, but functional option.  If you
@@ -17,11 +41,3 @@ config DECNET_ROUTER
 
          See <file:Documentation/networking/decnet.txt> for more information.
 
-config DECNET_ROUTE_FWMARK
-       bool "DECnet: use FWMARK value as routing key (EXPERIMENTAL)"
-       depends on DECNET_ROUTER && NETFILTER
-       help
-         If you say Y here, you will be able to specify different routes for
-         packets with different FWMARK ("firewalling mark") values
-         (see ipchains(8), "-m" argument).
-