From 68e6203e21c2346b7e1f4a52794fbafde2670dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Sun, 7 Oct 2007 23:37:55 -0700
Subject: [PATCH] --- yaml --- r: 66937 b: refs/heads/master c:
 de83c058af25aa97ed4864abab11e90e8dead6e2 h: refs/heads/master i:   66935:
 34f69b2fa1298e8d4afb986d0768b058be1a9b9c v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0a57710abb69..5ef6e9d39307 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c79e3357166a2ca39fd7613b0eb7f493c1ac5e11
+refs/heads/master: de83c058af25aa97ed4864abab11e90e8dead6e2
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 7c1a92ffa083..4268cd13ff9a 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -1160,7 +1160,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
 	int first_sack_index;
 
 	if (!tp->sacked_out) {
-		tp->fackets_out = 0;
+		if (WARN_ON(tp->fackets_out))
+			tp->fackets_out = 0;
 		tp->highest_sack = tp->snd_una;
 	}
 	prior_fackets = tp->fackets_out;