Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 111743
b: refs/heads/master
c: f0ceb0e
h: refs/heads/master
i:
  111741: 001cc61
  111739: 035592a
  111735: 60641f0
  111727: b98a837
  111711: e9da6d7
  111679: 76fd3b2
  111615: 7c62613
v: v3
  • Loading branch information
Ilpo Järvinen authored and David S. Miller committed Sep 21, 2008
1 parent 7439374 commit 3a40b7e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0e1c54c2a405494281e0639aacc90db03b50ae77
refs/heads/master: f0ceb0ed86b4792a4ed9d3438f5f7572e48f9803
4 changes: 1 addition & 3 deletions trunk/net/ipv4/tcp_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -2096,10 +2096,8 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
if (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))
continue;

if (tcp_retransmit_skb(sk, skb)) {
tp->retransmit_skb_hint = NULL;
if (tcp_retransmit_skb(sk, skb))
return;
}
NET_INC_STATS_BH(sock_net(sk), mib_idx);

if (skb == tcp_write_queue_head(sk))
Expand Down

0 comments on commit 3a40b7e

Please sign in to comment.