---

yaml --- r: 78142 b: refs/heads/master c: 20de20b h: refs/heads/master v: v3
git-mirror · Jan 28, 2008 · 93d3644 · 93d3644
1 parent f16367d
commit 93d3644
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7ab97f78a5c573e49474edbd260ea6898ddccda
+refs/heads/master: 20de20beba6e9bd2e1c83696bfefa3b16cda9a74
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -1554,20 +1554,15 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
 			}
 
 			/* Rest of the block already fully processed? */
-			if (!after(end_seq, cache->end_seq)) {
-				skb = tcp_maybe_skipping_dsack(skb, sk, next_dup, cache->end_seq,
-							       &fack_count, &reord, &flag);
+			if (!after(end_seq, cache->end_seq))
 				goto advance_sp;
-			}
+
+			skb = tcp_maybe_skipping_dsack(skb, sk, next_dup, cache->end_seq,
+						       &fack_count, &reord, &flag);
 
 			/* ...tail remains todo... */
 			if (TCP_SKB_CB(tp->highest_sack)->end_seq == cache->end_seq) {
-				/* ...but better entrypoint exists! Check that DSACKs are
-				 * properly accounted while skipping here
-				 */
-				tcp_maybe_skipping_dsack(skb, sk, next_dup, cache->end_seq,
-							 &fack_count, &reord, &flag);
-
+				/* ...but better entrypoint exists! */
 				skb = tcp_write_queue_next(sk, tp->highest_sack);
 				fack_count = tp->fackets_out;
 				cache++;