---

yaml --- r: 300751 b: refs/heads/master c: a8cb05b h: refs/heads/master i: 300749: cd4c40d 300747: e863d13 300743: c23fd0b 300735: c0d5120 v: v3
git-mirror · Apr 14, 2012 · dba54e4 · dba54e4
1 parent 396603b
commit dba54e4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);