aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2007-12-02 00:47:58 +0200
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:55:41 -0800
commitede9f3b186bc3eb0fce084bdcab500efc3721a80 (patch)
tree78d421c79f18e3d56e9ab079459081d3d8dc42d8 /net
parent407ef1de03e87225d75a9bed271f35ea6880f5f1 (diff)
[TCP]: Unite identical code from two seqno split blocks
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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_input.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 87111084280..d313dea361a 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1246,8 +1246,7 @@ static int tcp_sacktag_one(struct sk_buff *skb, struct tcp_sock *tp,
if (dup_sack && (sacked & TCPCB_RETRANS)) {
if (after(TCP_SKB_CB(skb)->end_seq, tp->undo_marker))
tp->undo_retrans--;
- if (!after(TCP_SKB_CB(skb)->end_seq, tp->snd_una) &&
- (sacked & TCPCB_SACKED_ACKED))
+ if (sacked & TCPCB_SACKED_ACKED)
*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)))
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