diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-15 14:38:29 -0400 | 
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-15 14:38:29 -0400 | 
| commit | e48d199ba10bb8267f491a3a585ca4a833e950a4 (patch) | |
| tree | c7d308a42479c8f21aaef889abfa004b0f1bb482 /net/ipv4/tcp_output.c | |
| parent | cce246ee5f3c7f4d3539ea41d13feb7a07859145 (diff) | |
| parent | 0de19a456cb59106420864927fdec152310f70b6 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 | 
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 72b9350006fe..d29ef79c00ca 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c  | |||
| @@ -1808,6 +1808,9 @@ void tcp_simple_retransmit(struct sock *sk) | |||
| 1808 | if (!lost) | 1808 | if (!lost) | 
| 1809 | return; | 1809 | return; | 
| 1810 | 1810 | ||
| 1811 | if (tcp_is_reno(tp)) | ||
| 1812 | tcp_limit_reno_sacked(tp); | ||
| 1813 | |||
| 1811 | tcp_verify_left_out(tp); | 1814 | tcp_verify_left_out(tp); | 
| 1812 | 1815 | ||
| 1813 | /* Don't muck with the congestion window here. | 1816 | /* Don't muck with the congestion window here. | 
