[TCP]: Bidir flow must not disregard SACK blocks for lost marking

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_input.c

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 41163ddc312cce05cd6f28515adc2b9cdf48937a..378ca8a086a393436491b0e54638787567fd06e0 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2112,7 +2112,10 @@ tcp_fastretrans_alert(struct sock *sk, u32 prior_snd_una,
 {
        struct inet_connection_sock *icsk = inet_csk(sk);
        struct tcp_sock *tp = tcp_sk(sk);
-       int is_dupack = (tp->snd_una == prior_snd_una && !(flag&FLAG_NOT_DUP));
+       int is_dupack = (tp->snd_una == prior_snd_una &&
+                        (!(flag&FLAG_NOT_DUP) ||
+                         ((flag&FLAG_DATA_SACKED) &&
+                          (tp->fackets_out > tp->reordering))));
 
        /* Some technical things:
         * 1. Reno does not count dupacks (sacked_out) automatically. */