From dba54e4cf3a3203e55cdafddf84fed7fdb562c46 Mon Sep 17 00:00:00 2001
From: Vijay Subramanian <subramanian.vijay@gmail.com>
Date: Fri, 13 Apr 2012 13:23:59 +0000
Subject: [PATCH] --- yaml --- r: 300751 b: refs/heads/master c:
 a8cb05b238e0edfd7c63f496d9ce3e238ea68a16 h: refs/heads/master i:   300749:
 cd4c40d55bac7d2aa2e251e8d4dfd003f84111ec   300747:
 e863d13e3f2dc55571dae6818e54745ad659b227   300743:
 c23fd0b561add25ab9d7f5f810b45cff125b2a73   300735:
 c0d512085906894a838e83bd4d17f7b8ca768575 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f43d565e183c..72f00d6d2023 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aacd9289af8b82f5fb01bcdd53d0e3406d1333c7
+refs/heads/master: a8cb05b238e0edfd7c63f496d9ce3e238ea68a16
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index dc1e0be30b77..3dc94febc9ee 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -5734,8 +5734,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
 			 */
 			inet_csk_schedule_ack(sk);
 			icsk->icsk_ack.lrcvtime = tcp_time_stamp;
-			icsk->icsk_ack.ato	 = TCP_ATO_MIN;
-			tcp_incr_quickack(sk);
 			tcp_enter_quickack_mode(sk);
 			inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
 						  TCP_DELACK_MAX, TCP_RTO_MAX);