Commit 89d478f7 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[TCP]: Remove duplicated code block from clean_rtx_queue 



Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 234b6860

net/ipv4/tcp_input.c

+21 −29
Original line number Diff line number Diff line
@@ -2801,7 +2801,6 @@ static int tcp_clean_rtx_queue(struct sock *sk, s32 *seq_rtt_p, 
			tcp_mtup_probe_success(sk, skb);

		}



		if (sacked) {

		if (sacked & TCPCB_RETRANS) {

			if (sacked & TCPCB_SACKED_RETRANS)

				tp->retrans_out -= packets_acked;
@@ -2829,14 +2828,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, s32 *seq_rtt_p, 
		if ((sacked & TCPCB_URG) && tp->urg_mode &&

		    !before(end_seq, tp->snd_up))

			tp->urg_mode = 0;

		} else {

			ca_seq_rtt = now - scb->when;

			last_ackt = skb->tstamp;

			if (seq_rtt < 0) {

				seq_rtt = ca_seq_rtt;

			}

			reord = min(cnt, reord);

		}



		tp->packets_out -= packets_acked;

		cnt += packets_acked;