svn commit: r188002 - in projects/tcp_cc_7.x/sys: . netinet

[Lawrence Stewart]

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)
 {
 	/*