From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 03:22:44 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 8563F106566C;
	Thu, 16 Apr 2009 03:22:44 +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 733DF8FC14;
	Thu, 16 Apr 2009 03:22:44 +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 n3G3Mi7P065513;
	Thu, 16 Apr 2009 03:22:44 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3G3MiH7065512;
	Thu, 16 Apr 2009 03:22:44 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200904160322.n3G3MiH7065512@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Thu, 16 Apr 2009 03:22:44 +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: r191132 - 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: Thu, 16 Apr 2009 03:22:44 -0000

Author: lstewart
Date: Thu Apr 16 03:22:44 2009
New Revision: 191132
URL: http://svn.freebsd.org/changeset/base/191132

Log:
  Merge r190862 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_htcp.c

Modified: projects/tcp_cc_7.x/sys/netinet/cc_htcp.c
==============================================================================
--- projects/tcp_cc_7.x/sys/netinet/cc_htcp.c	Thu Apr 16 00:13:23 2009	(r191131)
+++ projects/tcp_cc_7.x/sys/netinet/cc_htcp.c	Thu Apr 16 03:22:44 2009	(r191132)
@@ -1,5 +1,6 @@
 /*-
- * Copyright (c) 2008 Swinburne University of Technology, Melbourne, Australia
+ * Copyright (c) 2007-2009
+ * 	Swinburne University of Technology, Melbourne, Australia
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
@@ -33,7 +34,7 @@
 /*
  * HTCP
  *
- * An implementation of HTCP congestion algorithm for FreeBSD 7.0
+ * An implementation of HTCP congestion algorithm for FreeBSD.
  * The algorithm is based on the one described in "H-TCP: A framework
  * for congestion control in high-speed and long-distance networks" by
  * Leith, Shorten and Lee.