From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 17 02:52:23 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 C2E66106566C;
	Fri, 17 Apr 2009 02:52:23 +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 AF3238FC14;
	Fri, 17 Apr 2009 02:52:23 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3H2qNEj004297;
	Fri, 17 Apr 2009 02:52:23 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3H2qNDd004296;
	Fri, 17 Apr 2009 02:52:23 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200904170252.n3H2qNDd004296@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Fri, 17 Apr 2009 02:52:23 +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: r191186 - in projects/tcp_cc_7.x/sys: . contrib/pf
	dev/ath/ath_hal dev/cxgb 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: Fri, 17 Apr 2009 02:52:24 -0000

Author: lstewart
Date: Fri Apr 17 02:52:23 2009
New Revision: 191186
URL: http://svn.freebsd.org/changeset/base/191186

Log:
  Merge r191185 from projects/tcp_cc_8.x

Modified:
  projects/tcp_cc_7.x/sys/   (props changed)
  projects/tcp_cc_7.x/sys/contrib/pf/   (props changed)
  projects/tcp_cc_7.x/sys/dev/ath/ath_hal/   (props changed)
  projects/tcp_cc_7.x/sys/dev/cxgb/   (props changed)
  projects/tcp_cc_7.x/sys/netinet/cc.c

Modified: projects/tcp_cc_7.x/sys/netinet/cc.c
==============================================================================
--- projects/tcp_cc_7.x/sys/netinet/cc.c	Fri Apr 17 02:46:31 2009	(r191185)
+++ projects/tcp_cc_7.x/sys/netinet/cc.c	Fri Apr 17 02:52:23 2009	(r191186)
@@ -185,7 +185,7 @@ cc_deregister_algorithm(struct cc_algo *
 		INP_INFO_RLOCK(&tcbinfo);
 		LIST_FOREACH(inp, &tcb, inp_list) {
 			/* skip tcptw structs */
-			if (inp->inp_vflag & INP_TIMEWAIT)
+			if (inp->inp_flags & INP_TIMEWAIT)
 				continue;
 			INP_WLOCK(inp);
 			if ((tp = intotcpcb(inp)) != NULL) {