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

tcp: Reorganize skb tagbit checks

Browse Source 
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:22:59 -07:00
committed by David S. Miller
parent 34638570b5
commit 61eb55f4db
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv4/tcp_output.c
View File

@@ -2032,6 +2032,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
const struct inet_connection_sock *icsk = inet_csk(sk); const struct inet_connection_sock *icsk = inet_csk(sk);
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *skb; struct sk_buff *skb;
int mib_idx;
if (tp->retransmit_skb_hint) if (tp->retransmit_skb_hint)
skb = tp->retransmit_skb_hint; skb = tp->retransmit_skb_hint;
@@ -2059,10 +2060,11 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
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))
continue;
if (sacked & TCPCB_LOST) { if (!(sacked & TCPCB_LOST))
if (!(sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))) { continue;
int mib_idx;
if (tcp_retransmit_skb(sk, skb)) { if (tcp_retransmit_skb(sk, skb)) {
tp->retransmit_skb_hint = NULL; tp->retransmit_skb_hint = NULL;
@@ -2080,8 +2082,6 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
TCP_RTO_MAX); TCP_RTO_MAX);
} }
} }
}
}
/* OK, demanded retransmission is finished. */ /* OK, demanded retransmission is finished. */
if (!tcp_can_forward_retransmit(sk)) if (!tcp_can_forward_retransmit(sk))