[PATCH] [TCP]: Make invariant check complain about invalid sacked_out

[PATCH] [TCP]: Make invariant check complain about invalid sacked_out

[Ilpo Järvinen]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 854 bytes --]


Earlier resolution for NewReno's sacked_out should now keep
it small enough for this to become invariant-like check.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
 net/ipv4/tcp_input.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index fef1191..f1eee2d 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2510,11 +2510,8 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
 				    (tcp_fackets_out(tp) > tp->reordering));
 	int fast_rexmit = 0;
 
-	/* Some technical things:
-	 * 1. Reno does not count dupacks (sacked_out) automatically. */
-	if (!tp->packets_out)
+	if (WARN_ON(!tp->packets_out && tp->sacked_out))
 		tp->sacked_out = 0;
-
 	if (WARN_ON(!tp->sacked_out && tp->fackets_out))
 		tp->fackets_out = 0;
 
-- 
1.5.0.6

Re: [PATCH] [TCP]: Make invariant check complain about invalid sacked_out

[Ilpo Järvinen]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 304 bytes --]

On Wed, 5 Dec 2007, Ilpo Järvinen wrote:

> 
> Earlier resolution for NewReno's sacked_out should now keep
> it small enough for this to become invariant-like check.
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

Forgot to modify it to the subject, this one to net-2.6.25 please.

-- 
 i.

Re: [PATCH] [TCP]: Make invariant check complain about invalid sacked_out

[David Miller]

From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Wed, 5 Dec 2007 21:36:37 +0200 (EET)

> On Wed, 5 Dec 2007, Ilpo Järvinen wrote:
> 
> > 
> > Earlier resolution for NewReno's sacked_out should now keep
> > it small enough for this to become invariant-like check.
> > 
> > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> 
> Forgot to modify it to the subject, this one to net-2.6.25 please.

Applied to net-2.6.25, thanks!