svn commit: r203909 - projects/tcp_cc_head/sys/netinet

[Lawrence Stewart]

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;