dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

tcp: remove tp->lost_out guard to make joining diff nicer 

The validity of the retransmit_high must then be ensured
if no L'ed skb exits!

This makes a minor change to behavior, we now have to
iterate the head to find out that the loop terminates.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilpo Järvinen 2008-09-20 21:23:49 -07:00 committed by David S. Miller
parent 61eb55f4db
commit 08ebd1721a
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
net/ipv4/tcp_output.c
View File

@ -2034,53 +2034,54 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
struct sk_buff *skb; struct sk_buff *skb;
int mib_idx; int mib_idx;
if (!tp->lost_out)
tp->retransmit_high = tp->snd_una;
if (tp->retransmit_skb_hint) if (tp->retransmit_skb_hint)
skb = tp->retransmit_skb_hint; skb = tp->retransmit_skb_hint;
else else
skb = tcp_write_queue_head(sk); skb = tcp_write_queue_head(sk);
/* First pass: retransmit lost packets. */ /* First pass: retransmit lost packets. */
if (tp->lost_out) { tcp_for_write_queue_from(skb, sk) {
tcp_for_write_queue_from(skb, sk) { __u8 sacked = TCP_SKB_CB(skb)->sacked;
__u8 sacked = TCP_SKB_CB(skb)->sacked;
if (skb == tcp_send_head(sk)) if (skb == tcp_send_head(sk))
break; break;
/* we could do better than to assign each time */ /* we could do better than to assign each time */
tp->retransmit_skb_hint = skb; tp->retransmit_skb_hint = skb;
/* Assume this retransmit will generate /* Assume this retransmit will generate
* only one packet for congestion window * only one packet for congestion window
* calculation purposes. This works because * calculation purposes. This works because
* tcp_retransmit_skb() will chop up the * tcp_retransmit_skb() will chop up the
* packet to be MSS sized and all the * packet to be MSS sized and all the
* packet counting works out. * packet counting works out.
*/ */
if (tcp_packets_in_flight(tp) >= tp->snd_cwnd) if (tcp_packets_in_flight(tp) >= tp->snd_cwnd)
return; return;
if (!before(TCP_SKB_CB(skb)->seq, tp->retransmit_high)) if (!before(TCP_SKB_CB(skb)->seq, tp->retransmit_high))
break; break;
if (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS)) if (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))
continue; continue;
if (!(sacked & TCPCB_LOST)) if (!(sacked & TCPCB_LOST))
continue; continue;
if (tcp_retransmit_skb(sk, skb)) { if (tcp_retransmit_skb(sk, skb)) {
tp->retransmit_skb_hint = NULL; tp->retransmit_skb_hint = NULL;
return; return;
}
if (icsk->icsk_ca_state != TCP_CA_Loss)
mib_idx = LINUX_MIB_TCPFASTRETRANS;
else
mib_idx = LINUX_MIB_TCPSLOWSTARTRETRANS;
NET_INC_STATS_BH(sock_net(sk), mib_idx);
if (skb == tcp_write_queue_head(sk))
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
inet_csk(sk)->icsk_rto,
TCP_RTO_MAX);
} }
if (icsk->icsk_ca_state != TCP_CA_Loss)
mib_idx = LINUX_MIB_TCPFASTRETRANS;
else
mib_idx = LINUX_MIB_TCPSLOWSTARTRETRANS;
NET_INC_STATS_BH(sock_net(sk), mib_idx);
if (skb == tcp_write_queue_head(sk))
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
inet_csk(sk)->icsk_rto,
TCP_RTO_MAX);
} }
/* OK, demanded retransmission is finished. */ /* OK, demanded retransmission is finished. */