diff mbox

[net-next] tcp:Remove redundant code entering quickack mode

Message ID 1334359439-10147-1-git-send-email-subramanian.vijay@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Vijay Subramanian April 13, 2012, 11:23 p.m. UTC 
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>
---
 net/ipv4/tcp_input.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Comments

Flavio Leitner April 14, 2012, 5:01 a.m. UTC | #1 
On Fri, 13 Apr 2012 16:23:59 -0700
Vijay Subramanian <subramanian.vijay@gmail.com> wrote:

> 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>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller April 14, 2012, 7:26 p.m. UTC | #2 
From: Flavio Leitner <fbl@redhat.com>
Date: Sat, 14 Apr 2012 02:01:03 -0300

> On Fri, 13 Apr 2012 16:23:59 -0700
> Vijay Subramanian <subramanian.vijay@gmail.com> wrote:
> 
>> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 9944c1d..40c2039 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);