From owner-svn-src-projects@FreeBSD.ORG  Mon Feb  2 07:49:18 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 8E587106566B;
	Mon,  2 Feb 2009 07:49:18 +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 7D1C38FC17;
	Mon,  2 Feb 2009 07:49:18 +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 n127nIET084669;
	Mon, 2 Feb 2009 07:49:18 GMT (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n127nIHA084668;
	Mon, 2 Feb 2009 07:49:18 GMT (envelope-from lstewart@svn.freebsd.org)
Message-Id: <200902020749.n127nIHA084668@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Mon, 2 Feb 2009 07:49:18 +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: r188002 - in projects/tcp_cc_7.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: Mon, 02 Feb 2009 07:49:18 -0000

Author: lstewart
Date: Mon Feb  2 07:49:18 2009
New Revision: 188002
URL: http://svn.freebsd.org/changeset/base/188002

Log:
  Merge r184915 from tcp_cc_8.x

Modified:
  projects/tcp_cc_7.x/sys/   (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	Mon Feb  2 06:25:57 2009	(r188001)
+++ projects/tcp_cc_7.x/sys/netinet/cc.c	Mon Feb  2 07:49:18 2009	(r188002)
@@ -59,9 +59,6 @@ struct cc_head cc_list = STAILQ_HEAD_INI
 
 struct rwlock cc_list_lock;
 
-MALLOC_DECLARE(M_STRING);
-MALLOC_DEFINE(M_STRING, "string", "a string");
-
 /* create a struct to point to our newreno functions */
 struct cc_algo newreno_cc_algo = {
 	.name = "newreno",
@@ -248,7 +245,6 @@ cc_register_algorithm(struct cc_algo *ad
 int
 newreno_init(struct tcpcb *tp)
 {
-	printf("initialising tcp connection with newreno congestion control\n");
 	return 0;
 }
 
@@ -349,10 +345,10 @@ newreno_ack_received(struct tcpcb *tp, s
 /*
  * update the value of ssthresh before entering FR
  */
-void 
+void
 newreno_pre_fr(struct tcpcb *tp, struct tcphdr *th)
 {
-  newreno_ssthresh_update(tp);
+	newreno_ssthresh_update(tp);
 }
 
 /*
@@ -360,7 +356,7 @@ newreno_pre_fr(struct tcpcb *tp, struct 
  * th can be null, in which case cwnd will be set according to reno instead
  * of new reno.
  */
-void 
+void
 newreno_post_fr(struct tcpcb *tp, struct tcphdr *th)
 {
 	/*