Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / net / decnet / Kconfig

diff --git a/net/decnet/Kconfig b/net/decnet/Kconfig
index 36e72cb..f3393e1 100644 (file)
--- a/net/decnet/Kconfig
+++ b/net/decnet/Kconfig
@@ -25,8 +25,8 @@ config DECNET
          The module is called decnet.
 
 config DECNET_ROUTER
-       bool "DECnet: router support (EXPERIMENTAL)"
-       depends on DECNET && EXPERIMENTAL
+       bool "DECnet: router support"
+       depends on DECNET
        select FIB_RULES
        ---help---
          Add support for turning your DECnet Endnode into a level 1 or 2
@@ -41,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).
-