diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-03-04 00:05:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-03-04 00:05:42 -0500 |
| commit | 2e22ea7cea0f7de86fd30df867fbf5b7e8eee0fd (patch) | |
| tree | 8b8e5583fb2787ff7107a6f59b114ddcd2c2f691 /net/ipv4/tcp_output.c | |
| parent | 638bee71c83a2837b48062fdc5b222163cf53d79 (diff) | |
| parent | 645af4e9e0e32481e3336dda813688732c7e5f0f (diff) | |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index dda42f0bd7a3..da2c3b8794f2 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -2023,7 +2023,6 @@ void tcp_xmit_retransmit_queue(struct sock *sk) | |||
| 2023 | last_lost = tp->snd_una; | 2023 | last_lost = tp->snd_una; |
| 2024 | } | 2024 | } |
| 2025 | 2025 | ||
| 2026 | /* First pass: retransmit lost packets. */ | ||
| 2027 | tcp_for_write_queue_from(skb, sk) { | 2026 | tcp_for_write_queue_from(skb, sk) { |
| 2028 | __u8 sacked = TCP_SKB_CB(skb)->sacked; | 2027 | __u8 sacked = TCP_SKB_CB(skb)->sacked; |
| 2029 | 2028 | ||