From 34d6205313a2707c8a78825357de950971529780 Mon Sep 17 00:00:00 2001
From: Josh Hunt <johunt@akamai.com>
Date: Fri, 30 Jul 2010 13:49:35 +0000
Subject: [PATCH] --- yaml --- r: 204021 b: refs/heads/master c:
 3c0fef0b7d36e5f8d3ea3731a8228102274e3c23 h: refs/heads/master i:   204019:
 f6dae01b32866bfb0e9e2e273eb2743dbbba6073 v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/tcp.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a83c0bb86b9f..a17e62df9ab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99e6d06521f2a522ff5aaa812552f68220507c67
+refs/heads/master: 3c0fef0b7d36e5f8d3ea3731a8228102274e3c23
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 86b9f67abede..1a700651600b 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -2601,6 +2601,12 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
 			return -EFAULT;
 		return 0;
 	}
+	case TCP_THIN_LINEAR_TIMEOUTS:
+		val = tp->thin_lto;
+		break;
+	case TCP_THIN_DUPACK:
+		val = tp->thin_dupack;
+		break;
 	default:
 		return -ENOPROTOOPT;
 	}