adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TCP]: Unite identical code from two seqno split blocks

Browse source 
Bogus seqno compares just mislead, the code is identical for
both sides of the seqno compare (and was even executed just
once because of return in between).

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-02 00:47:58 +02:00 committed by David S. Miller
parent 407ef1de03
commit ede9f3b186
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/ipv4/tcp_input.c
View file

@ -1246,8 +1246,7 @@ static int tcp_sacktag_one(struct sk_buff *skb, struct tcp_sock *tp,
if (dup_sack && (sacked & TCPCB_RETRANS)) { if (dup_sack && (sacked & TCPCB_RETRANS)) {
if (after(TCP_SKB_CB(skb)->end_seq, tp->undo_marker)) if (after(TCP_SKB_CB(skb)->end_seq, tp->undo_marker))
tp->undo_retrans--; tp->undo_retrans--;
if (!after(TCP_SKB_CB(skb)->end_seq, tp->snd_una) && if (sacked & TCPCB_SACKED_ACKED)
(sacked & TCPCB_SACKED_ACKED))
*reord = min(fack_count, *reord); *reord = min(fack_count, *reord);
} }
@ -1310,10 +1309,6 @@ static int tcp_sacktag_one(struct sk_buff *skb, struct tcp_sock *tp,
if (after(TCP_SKB_CB(skb)->seq, tcp_highest_sack_seq(tp))) if (after(TCP_SKB_CB(skb)->seq, tcp_highest_sack_seq(tp)))
tp->highest_sack = skb; tp->highest_sack = skb;
} else {
if (dup_sack && (sacked & TCPCB_RETRANS))
*reord = min(fack_count, *reord);
} }
/* D-SACK. We can detect redundant retransmission in S|R and plain R /* D-SACK. We can detect redundant retransmission in S|R and plain R