diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-19 09:21:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-19 09:21:08 -0400 |
| commit | 2b3d6e2f23362b71de173649002d915d14e07622 (patch) | |
| tree | 6c1aab54bb16b4f0d06cd3b838e3e41d8488fb98 /net/ipv4/tcp_input.c | |
| parent | 7d5513d58d072cf38cae9c886653aadac38ef4a9 (diff) | |
| parent | 427abfa28afedffadfca9dd8b067eb6d36bac53f (diff) | |
| download | kernel_samsung_crespo-2b3d6e2f23362b71de173649002d915d14e07622.zip kernel_samsung_crespo-2b3d6e2f23362b71de173649002d915d14e07622.tar.gz kernel_samsung_crespo-2b3d6e2f23362b71de173649002d915d14e07622.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 4a538bc..b5521a9 100644 --- a/net/ipv4/tcp_input.c +++ b/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 && |