summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Subramanian <subramanian.vijay@gmail.com>2012-04-13 13:23:59 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-14 15:29:02 -0400
commita8cb05b238e0edfd7c63f496d9ce3e238ea68a16 (patch)
treed917bec3758b7b129d1def6053a995c07cb43f05
parentaacd9289af8b82f5fb01bcdd53d0e3406d1333c7 (diff)
downloadblackbird-op-linux-a8cb05b238e0edfd7c63f496d9ce3e238ea68a16.tar.gz
blackbird-op-linux-a8cb05b238e0edfd7c63f496d9ce3e238ea68a16.zip
tcp: Remove redundant code entering quickack mode
tcp_enter_quickack_mode() already calls tcp_incr_quickack() and sets icsk->icsk_ack.ato to TCP_ATO_MIN. This patch removes the duplication. Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com> Reviewed-by: Flavio Leitner <fbl@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_input.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index dc1e0be30b77..3dc94febc9ee 100644
--- a/net/ipv4/tcp_input.c
+++ b/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);
OpenPOWER on IntegriCloud