From 4730218a89e7ba53636ff5c471d8284577a18949 Mon Sep 17 00:00:00 2001
From: Sridhar Samudrala <sri@us.ibm.com>
Date: Fri, 29 Sep 2006 17:08:01 -0700
Subject: [PATCH] --- yaml --- r: 37212 b: refs/heads/master c:
 208edef6a5b6c50363c77efcf34c4b4020681029 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/sctp/socket.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1131e662c41f..6aacd942f065 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9317a40c4e09e20ef01601fc9f5de9e6acb5b96
+refs/heads/master: 208edef6a5b6c50363c77efcf34c4b4020681029
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
index 79c3e072cf28..3fe906d65069 100644
--- a/trunk/net/sctp/socket.c
+++ b/trunk/net/sctp/socket.c
@@ -3084,8 +3084,8 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
 	 */
 	sp->disable_fragments = 0;
 
-	/* Turn on/off any Nagle-like algorithm.  */
-	sp->nodelay           = 1;
+	/* Enable Nagle algorithm by default.  */
+	sp->nodelay           = 0;
 
 	/* Enable by default. */
 	sp->v4mapped          = 1;