From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25055 invoked by alias); 28 Jul 2009 09:23:32 -0000 Received: (qmail 25047 invoked by alias); 28 Jul 2009 09:23:32 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: dlm: master - dlm_controld: fix protocol initialization To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: dlm.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 041ee1d89567c842287dfc0bf1f707535fa03bbe X-Git-Newrev: 8d9ac6b0e990b3d48bf0d5b57da841cb11a68ba5 From: "Fabio M. Di Nitto" Message-Id: <20090728092304.1F426120378@lists.fedorahosted.org> Date: Tue, 28 Jul 2009 09:23:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00113.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=8d9ac6b0e990b3d48bf0d5b57da841cb11a68ba5 Commit: 8d9ac6b0e990b3d48bf0d5b57da841cb11a68ba5 Parent: 041ee1d89567c842287dfc0bf1f707535fa03bbe Author: Fabio M. Di Nitto AuthorDate: Tue Jul 28 11:17:20 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Jul 28 11:22:54 2009 +0200 dlm_controld: fix protocol initialization the fs/dlm/lowcomms.c check for protocol value assume 0 for TCP and any other value for SCTP. dlm_controld copies pristine the value into configfs with TCP set to 1 and SCTP set to 2. By specifing in cluster.conf, configfs value will be set to 1, therefor enabling SCTP. Align PROTO_* values to kernel check and initialize the correct procotol. Signed-off-by: Fabio M. Di Nitto --- group/dlm_controld/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group/dlm_controld/config.c b/group/dlm_controld/config.c index 548b47a..04f1987 100644 --- a/group/dlm_controld/config.c +++ b/group/dlm_controld/config.c @@ -26,8 +26,8 @@ #include "config.h" #include "ccs.h" -#define PROTO_TCP 1 -#define PROTO_SCTP 2 +#define PROTO_TCP 0 +#define PROTO_SCTP 1 int ccs_handle;