From 3a15f5d6d03b2c5ba2dfcfab728bbe8ad0fa323d Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Fri, 14 Jun 2013 04:56:14 -0500
Subject: [PATCH] --- yaml --- r: 377717 b: refs/heads/master c:
 86e92ad299fb0be359efdd61812944497d4d8d52 h: refs/heads/master i:   377715:
 6d02a1573343584418332c534dcc1b4cc9148fce v: v3

---
 [refs]                  | 2 +-
 trunk/fs/dlm/lowcomms.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 467ded878608..6db90528f206 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d6898714fe2ce485e95ac74479ed40ebd8d5748
+refs/heads/master: 86e92ad299fb0be359efdd61812944497d4d8d52
diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c
index a4fad32bb788..4f539dd9b1e9 100644
--- a/trunk/fs/dlm/lowcomms.c
+++ b/trunk/fs/dlm/lowcomms.c
@@ -1346,6 +1346,7 @@ static int sctp_listen_for_all(void)
 	int result = -EINVAL, num = 1, i, addr_len;
 	struct connection *con = nodeid2con(0, GFP_NOFS);
 	int bufsize = NEEDED_RMEM;
+	int one = 1;
 
 	if (!con)
 		return -ENOMEM;
@@ -1380,6 +1381,11 @@ static int sctp_listen_for_all(void)
 		goto create_delsock;
 	}
 
+	result = kernel_setsockopt(sock, SOL_SCTP, SCTP_NODELAY, (char *)&one,
+				   sizeof(one));
+	if (result < 0)
+		log_print("Could not set SCTP NODELAY error %d\n", result);
+
 	/* Init con struct */
 	sock->sk->sk_user_data = con;
 	con->sock = sock;