From owner-svn-src-projects@FreeBSD.ORG  Thu Sep 24 08:16:13 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6FC74106568F;
	Thu, 24 Sep 2009 08:16:13 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E7FE8FC0A;
	Thu, 24 Sep 2009 08:16:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8O8GDJa089453;
	Thu, 24 Sep 2009 08:16:13 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8O8GDrr089451;
	Thu, 24 Sep 2009 08:16:13 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200909240816.n8O8GDrr089451@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Thu, 24 Sep 2009 08:16:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197451 - projects/tcp_ffcaia2008_8.x/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Sep 2009 08:16:13 -0000

Author: lstewart
Date: Thu Sep 24 08:16:12 2009
New Revision: 197451
URL: http://svn.freebsd.org/changeset/base/197451

Log:
  Enable the KASSERT to catch accounting errors now that the patch to add
  sack_hole_bytes has been tested and works well.
  
  Sponsored by:	FreeBSD Foundation

Modified:
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c

Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c	Thu Sep 24 07:11:23 2009	(r197450)
+++ projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c	Thu Sep 24 08:16:12 2009	(r197451)
@@ -344,17 +344,12 @@ tcp_sackhole_remove(struct tcpcb *tp, st
 	/* Free this SACK hole. */
 	tcp_sackhole_free(tp, hole);
 
-	/*
 #ifdef INVARIANTS
 	if (TAILQ_EMPTY(&tp->snd_holes))
 		KASSERT(tp->sack_hole_bytes == 0,
-			("tp->sack_hole_bytes is %d instead of 0", tp->sack_hole_bytes));
+		    ("tp->sack_hole_bytes is %d instead of 0",
+		    tp->sack_hole_bytes));
 #endif
-	*/
-	if (TAILQ_EMPTY(&tp->snd_holes) && tp->sack_hole_bytes != 0) {
-		printf("conn (%p) tp->sack_hole_bytes is %d instead of 0\n", tp, tp->sack_hole_bytes);
-		tp->sack_hole_bytes = 0;
-	}
 }
 
 /*