diff options
| author | Per Hurtig <per.hurtig@kau.se> | 2014-06-12 17:08:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-15 08:31:57 +0200 |
| commit | dc5a170002bd45394f1a483e7af6d91b01e91dca (patch) | |
| tree | f20bf42cf3adf643173e29e0e470e3f7220aa23b /net | |
| parent | 2d435f096dd8618919b86c3575aeb0815bf799b4 (diff) | |
| download | linux-3.10-dc5a170002bd45394f1a483e7af6d91b01e91dca.tar.gz linux-3.10-dc5a170002bd45394f1a483e7af6d91b01e91dca.tar.bz2 linux-3.10-dc5a170002bd45394f1a483e7af6d91b01e91dca.zip | |
tcp: fixing TLP's FIN recovery
[ Upstream commit bef1909ee3ed1ca39231b260a8d3b4544ecd0c8f ]
Fix to a problem observed when losing a FIN segment that does not
contain data. In such situations, TLP is unable to recover from
*any* tail loss and instead adds at least PTO ms to the
retransmission process, i.e., RTO = RTO + PTO.
Signed-off-by: Per Hurtig <per.hurtig@kau.se>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Nandita Dukkipati <nanditad@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 62aff23d19d..11ef25c9cf4 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2036,9 +2036,7 @@ void tcp_send_loss_probe(struct sock *sk) if (WARN_ON(!skb || !tcp_skb_pcount(skb))) goto rearm_timer; - /* Probe with zero data doesn't trigger fast recovery. */ - if (skb->len > 0) - err = __tcp_retransmit_skb(sk, skb); + err = __tcp_retransmit_skb(sk, skb); /* Record snd_nxt for loss detection. */ if (likely(!err)) |