summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer Hurtig <per.hurtig@kau.se>2014-06-12 17:08:32 +0200
committerDavid S. Miller <davem@davemloft.net>2014-06-12 11:05:51 -0700
commitbef1909ee3ed1ca39231b260a8d3b4544ecd0c8f (patch)
tree79fcd83a88cbe8908d122af2498eed9f37220a3b
parentfba0e1a3cfcc1d61e593f97650e18931a2aa1fc8 (diff)
tcp: fixing TLP's FIN recovery
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>
-rw-r--r--net/ipv4/tcp_output.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index ad7549f1d0ad..819bf0c8fbde 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2131,9 +2131,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))