diff options
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 8 | 
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 680c4224ed9..ad70a962c20 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3484,8 +3484,7 @@ static bool tcp_process_frto(struct sock *sk, int flag)  	    ((tp->frto_counter >= 2) && (flag & FLAG_RETRANS_DATA_ACKED)))  		tp->undo_marker = 0; -	if (!before(tp->snd_una, tp->frto_highmark) || -	    !tcp_packets_in_flight(tp)) { +	if (!before(tp->snd_una, tp->frto_highmark)) {  		tcp_enter_frto_loss(sk, (tp->frto_counter == 1 ? 2 : 3), flag);  		return true;  	} @@ -3505,6 +3504,11 @@ static bool tcp_process_frto(struct sock *sk, int flag)  		}  	} else {  		if (!(flag & FLAG_DATA_ACKED) && (tp->frto_counter == 1)) { +			if (!tcp_packets_in_flight(tp)) { +				tcp_enter_frto_loss(sk, 2, flag); +				return true; +			} +  			/* Prevent sending of new data. */  			tp->snd_cwnd = min(tp->snd_cwnd,  					   tcp_packets_in_flight(tp));  |