From owner-svn-src-projects@FreeBSD.ORG  Mon Feb 15 03:09:57 2010
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 3644F106566B;
	Mon, 15 Feb 2010 03:09:57 +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 24B468FC1B;
	Mon, 15 Feb 2010 03:09:57 +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 o1F39uFk072466;
	Mon, 15 Feb 2010 03:09:56 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1F39usR072465;
	Mon, 15 Feb 2010 03:09:56 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <201002150309.o1F39usR072465@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Mon, 15 Feb 2010 03:09:56 +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: r203909 - projects/tcp_cc_head/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, 15 Feb 2010 03:09:57 -0000

Author: lstewart
Date: Mon Feb 15 03:09:55 2010
New Revision: 203909
URL: http://svn.freebsd.org/changeset/base/203909

Log:
  Update the new CC modules to use the revised gethelper_dblock() interface.

Modified:
  projects/tcp_cc_head/sys/netinet/cc_hd.c
  projects/tcp_cc_head/sys/netinet/cc_vegas.c

Modified: projects/tcp_cc_head/sys/netinet/cc_hd.c
==============================================================================
--- projects/tcp_cc_head/sys/netinet/cc_hd.c	Mon Feb 15 01:15:37 2010	(r203908)
+++ projects/tcp_cc_head/sys/netinet/cc_hd.c	Mon Feb 15 03:09:55 2010	(r203909)
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 
 #include <netinet/cc.h>
 #include <netinet/cc_module.h>
-#include <netinet/h_ertt.h>i
+#include <netinet/h_ertt.h>
 #include <netinet/helper.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
@@ -191,12 +191,12 @@ hd_congestion_exp(struct tcpcb *tp)
 }
 
 /* Hamilton delay based congestion control detection and response */
-	void
+void
 hd_ack_received(struct tcpcb *tp, struct tcphdr *th)
 { 
 
-	struct ertt *e_t = (struct ertt *)get_helper_dblock(tp->dblocks,
-	    tp->n_dblocks, V_ertt_id);
+	struct ertt *e_t = (struct ertt *)get_helper_dblock(tp->hdbs,
+	    V_ertt_id);
 
 	if (e_t->rtt && e_t->minrtt && (V_hd_qthresh > 0)) {
 		int Qdly = e_t->rtt - e_t->minrtt;

Modified: projects/tcp_cc_head/sys/netinet/cc_vegas.c
==============================================================================
--- projects/tcp_cc_head/sys/netinet/cc_vegas.c	Mon Feb 15 01:15:37 2010	(r203908)
+++ projects/tcp_cc_head/sys/netinet/cc_vegas.c	Mon Feb 15 03:09:55 2010	(r203909)
@@ -125,8 +125,8 @@ vegas_beta_handler(SYSCTL_HANDLER_ARGS)
 void
 vegas_ack_received(struct tcpcb *tp, struct tcphdr *th)
 {
-	struct ertt *e_t = (struct ertt *) get_helper_dblock(tp->dblocks,
-	    tp->n_dblocks, V_ertt_id);
+	struct ertt *e_t = (struct ertt *) get_helper_dblock(tp->hdbs,
+	    V_ertt_id);
 	struct vegas *vegas_data = CC_DATA(tp);
 	long expected_tx_rate, actual_tx_rate;