chelsio: use const for virtual functions

[powerpc.git] / fs / dlm / Kconfig

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 09e78bf..6fa7b0d 100644 (file)
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,29 +1,38 @@
 menu "Distributed Lock Manager"
-       depends on INET && EXPERIMENTAL
+       depends on EXPERIMENTAL && INET
 
 config DLM
        tristate "Distributed Lock Manager (DLM)"
-       depends on IPV6 || IPV6=n
-       depends on IP_SCTP
+       depends on SYSFS && (IPV6 || IPV6=n)
        select CONFIGFS_FS
+       select IP_SCTP if DLM_SCTP
        help
-       A general purpose distributed lock manager for kernel or userspace
-       applications.
+         A general purpose distributed lock manager for kernel or userspace
+         applications.
 
-config DLM_DEVICE
-       tristate "DLM device for userspace access"
+choice
+       prompt "Select DLM communications protocol"
        depends on DLM
+       default DLM_TCP
        help
-       This module creates a misc device through which the dlm lockspace
-       and locking functions become available to userspace applications
-       (usually through the libdlm library).
+         The DLM Can use TCP or SCTP for it's network communications.
+         SCTP supports multi-homed operations whereas TCP doesn't.
+         However, SCTP seems to have stability problems at the moment.
+
+config DLM_TCP
+       bool "TCP/IP"
+
+config DLM_SCTP
+       bool "SCTP"
+
+endchoice
 
 config DLM_DEBUG
        bool "DLM debugging"
        depends on DLM
        help
-       Under the debugfs mount point, the name of each lockspace will
-       appear as a file in the "dlm" directory.  The output is the
-       list of resource and locks the local node knows about.
+         Under the debugfs mount point, the name of each lockspace will
+         appear as a file in the "dlm" directory.  The output is the
+         list of resource and locks the local node knows about.
 
 endmenu