From 087aa606f8f6af1430371d602652c5df6ff4ec8d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 21 Nov 2009 11:22:25 -0800
Subject: [PATCH] --- yaml --- r: 171775 b: refs/heads/master c:
 e994b7c901ded7200b525a707c6da71f2cf6d4bb h: refs/heads/master i:   171773:
 db58296760c43782cf1c3de7dfe9f4b538af825d   171771:
 b1bc1cdbc5bfffb658b6cd1ec02baf4676b31e40   171767:
 e3b6436cf62b8596fa1c57bcdf3c3e56e316ea83   171759:
 dbbb20e78dd821aea3d93591b5d8f0cc6f909d06   171743:
 9e484f854bce6dcbd2ad0a592f34741ed9484a4f   171711:
 0153afb8cec6c30ebbc99f5ffb1713e043ef0f12   171647:
 7a3f93d764b4bc01a58ae2eda40f633989818c8e   171519:
 bfc86208a1f22038333901cb41c9045b7402e14a v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv4/tcp_minisocks.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c193e1e40647..cab6efe4ee75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8964be4a9a5ca8cab1219bb046db2f6d1936227c
+refs/heads/master: e994b7c901ded7200b525a707c6da71f2cf6d4bb
diff --git a/trunk/net/ipv4/tcp_minisocks.c b/trunk/net/ipv4/tcp_minisocks.c
index 4be22280e6b3..ab32c181f749 100644
--- a/trunk/net/ipv4/tcp_minisocks.c
+++ b/trunk/net/ipv4/tcp_minisocks.c
@@ -26,13 +26,7 @@
 #include <net/inet_common.h>
 #include <net/xfrm.h>
 
-#ifdef CONFIG_SYSCTL
-#define SYNC_INIT 0 /* let the user enable it */
-#else
-#define SYNC_INIT 1
-#endif
-
-int sysctl_tcp_syncookies __read_mostly = SYNC_INIT;
+int sysctl_tcp_syncookies __read_mostly = 1;
 EXPORT_SYMBOL(sysctl_tcp_syncookies);
 
 int sysctl_tcp_abort_on_overflow __read_mostly;