From 0b023874cf968b0f00e1312822e3d6df50b30c0d Mon Sep 17 00:00:00 2001 From: Aki M Nyrhinen Date: Sun, 11 Jun 2006 21:18:56 -0700 Subject: [PATCH] --- yaml --- r: 27199 b: refs/heads/master c: 79320d7e14900c549c3520791a297328f53ff71e h: refs/heads/master i: 27197: 6d34dd26e12d8c5767075037c06faaa462541ab8 27195: 6e15b8b40ea75d69c51e4ca247c39aae956d0bf0 27191: c8ca945c9fc0380ab9d734ebc2c0fe8af17e767d 27183: 3b56f117ef9c52070a09335f8c4abccac14750c7 27167: c07cc4ca15b82fe4fccf0ee2d93df31c4be9fe7d 27135: 6a70082c469bc9a564fe730c5d1b0297d4e05541 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c6d60462fa5c..eb17acb48263 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afec35e3fee900b3016519d0b5512064e4625b2c +refs/heads/master: 79320d7e14900c549c3520791a297328f53ff71e diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c index 4a538bc1683d..b5521a9d3dc1 100644 --- a/trunk/net/ipv4/tcp_input.c +++ b/trunk/net/ipv4/tcp_input.c @@ -1649,7 +1649,7 @@ static void tcp_update_scoreboard(struct sock *sk, struct tcp_sock *tp) * Hence, we can detect timed out packets during fast * retransmit without falling to slow start. */ - if (tcp_head_timedout(sk, tp)) { + if (!IsReno(tp) && tcp_head_timedout(sk, tp)) { struct sk_buff *skb; skb = tp->scoreboard_skb_hint ? tp->scoreboard_skb_hint @@ -1662,8 +1662,6 @@ static void tcp_update_scoreboard(struct sock *sk, struct tcp_sock *tp) if (!(TCP_SKB_CB(skb)->sacked&TCPCB_TAGBITS)) { TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; tp->lost_out += tcp_skb_pcount(skb); - if (IsReno(tp)) - tcp_remove_reno_sacks(sk, tp, tcp_skb_pcount(skb) + 1); /* clear xmit_retrans hint */ if (tp->retransmit_skb_hint &&