lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TCP]: Remove duplicated code block from clean_rtx_queue

Browse Source 
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilpo Järvinen
2007-12-30 04:35:27 -08:00
committed by David S. Miller
parent 234b686070
commit 89d478f7f2
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
net/ipv4/tcp_input.c
View File

@@ -2801,42 +2801,34 @@ static int tcp_clean_rtx_queue(struct sock *sk, s32 *seq_rtt_p,
tcp_mtup_probe_success(sk, skb); tcp_mtup_probe_success(sk, skb);
} }
if (sacked) { if (sacked & TCPCB_RETRANS) {
if (sacked & TCPCB_RETRANS) { if (sacked & TCPCB_SACKED_RETRANS)
if (sacked & TCPCB_SACKED_RETRANS) tp->retrans_out -= packets_acked;
tp->retrans_out -= packets_acked; flag |= FLAG_RETRANS_DATA_ACKED;
flag |= FLAG_RETRANS_DATA_ACKED; ca_seq_rtt = -1;
ca_seq_rtt = -1; seq_rtt = -1;
seq_rtt = -1; if ((flag & FLAG_DATA_ACKED) ||
if ((flag & FLAG_DATA_ACKED) || (packets_acked > 1))
(packets_acked > 1)) flag |= FLAG_NONHEAD_RETRANS_ACKED;
flag |= FLAG_NONHEAD_RETRANS_ACKED;
} else {
ca_seq_rtt = now - scb->when;
last_ackt = skb->tstamp;
if (seq_rtt < 0) {
seq_rtt = ca_seq_rtt;
}
if (!(sacked & TCPCB_SACKED_ACKED))
reord = min(cnt, reord);
}
if (sacked & TCPCB_SACKED_ACKED)
tp->sacked_out -= packets_acked;
if (sacked & TCPCB_LOST)
tp->lost_out -= packets_acked;
if ((sacked & TCPCB_URG) && tp->urg_mode &&
!before(end_seq, tp->snd_up))
tp->urg_mode = 0;
} else { } else {
ca_seq_rtt = now - scb->when; ca_seq_rtt = now - scb->when;
last_ackt = skb->tstamp; last_ackt = skb->tstamp;
if (seq_rtt < 0) { if (seq_rtt < 0) {
seq_rtt = ca_seq_rtt; seq_rtt = ca_seq_rtt;
} }
reord = min(cnt, reord); if (!(sacked & TCPCB_SACKED_ACKED))
reord = min(cnt, reord);
} }
if (sacked & TCPCB_SACKED_ACKED)
tp->sacked_out -= packets_acked;
if (sacked & TCPCB_LOST)
tp->lost_out -= packets_acked;
if ((sacked & TCPCB_URG) && tp->urg_mode &&
!before(end_seq, tp->snd_up))
tp->urg_mode = 0;
tp->packets_out -= packets_acked; tp->packets_out -= packets_acked;
cnt += packets_acked; cnt += packets_acked;