提交 ede9f3b1 编写于 作者: I Ilpo Järvinen 提交者: David S. Miller

[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: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 407ef1de
...@@ -1246,8 +1246,7 @@ static int tcp_sacktag_one(struct sk_buff *skb, struct tcp_sock *tp, ...@@ -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, ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册