---

yaml --- r: 43282 b: refs/heads/master c: fdda387 h: refs/heads/master v: v3
git-mirror · Nov 30, 2006 · cfa93ac · cfa93ac
1 parent fa6a3f8
commit cfa93ac
Show file tree

Hide file tree

Showing 5 changed files with 1,284 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61057c6bb3a3d14cf2bea6ca20dc6d367e1d852e
+refs/heads/master: fdda387f73947e6ae511ec601f5b3c6fbb582aac
diff --git a/trunk/fs/dlm/Kconfig b/trunk/fs/dlm/Kconfig
@@ -9,6 +9,23 @@ config DLM
 	A general purpose distributed lock manager for kernel or userspace
 	applications.
 
+choice
+	prompt "Select DLM communications protocol"
+	depends on DLM
+	default DLM_TCP
+	help
+	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

diff --git a/trunk/fs/dlm/Makefile b/trunk/fs/dlm/Makefile
@@ -4,7 +4,6 @@ dlm-y :=			ast.o \
 				dir.o \
 				lock.o \
 				lockspace.o \
-				lowcomms.o \
 				main.o \
 				member.o \
 				memory.o \
@@ -17,3 +16,6 @@ dlm-y :=			ast.o \
 				util.o
 dlm-$(CONFIG_DLM_DEBUG) +=	debug_fs.o
 
+dlm-$(CONFIG_DLM_TCP)   += lowcomms-tcp.o
+
+dlm-$(CONFIG_DLM_SCTP)  += lowcomms-sctp.o
diff --git a/trunk/fs/dlm/lowcomms.c → trunk/fs/dlm/lowcomms-sctp.c b/trunk/fs/dlm/lowcomms.c → trunk/fs/dlm/lowcomms-sctp.c