From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Mon, 8 Oct 2007 06:37:55 +0000 (-0700)
Subject: [TCP]: "Annotate" another fackets_out state reset
X-Git-Tag: v2.6.24-rc1~1454^2~146
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=de83c058af25aa97ed4864abab11e90e8dead6e2;p=~shefty%2Frdma-dev.git

[TCP]: "Annotate" another fackets_out state reset

This should no longer be necessary because fackets_out is
accurate. It indicates bugs elsewhere, thus report it.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 7c1a92ffa08..4268cd13ff9 100644
--- a/net/ipv4/tcp_input.c
+++ b/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;