From 134fb5a03a8415d5a552a2c09e6952c025cca136 Mon Sep 17 00:00:00 2001
From: Baruch Even <baruch@ev-en.org>
Date: Sun, 4 Feb 2007 23:37:41 -0800
Subject: [PATCH] --- yaml --- r: 46940 b: refs/heads/master c:
 8a3c3a972741dec77220a19642bd3331551ad2d9 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 872091731c46..b37f44fc8686 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f74651ae626ec672028587bc700538076dfbefb
+refs/heads/master: 8a3c3a972741dec77220a19642bd3331551ad2d9
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 870f53afd363..c6109895bb5e 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -998,6 +998,11 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
 		tp->recv_sack_cache[i].start_seq = start_seq;
 		tp->recv_sack_cache[i].end_seq = end_seq;
 	}
+	/* Clear the rest of the cache sack blocks so they won't match mistakenly. */
+	for (; i < ARRAY_SIZE(tp->recv_sack_cache); i++) {
+		tp->recv_sack_cache[i].start_seq = 0;
+		tp->recv_sack_cache[i].end_seq = 0;
+	}
 
 	first_sack_index = 0;
 	if (flag)