diff -r 5c1d68ee8029 sys/netinet/cc.h
--- a/sys/netinet/cc.h	Sat Nov 13 12:52:44 2010 +0000
+++ b/sys/netinet/cc.h	Sun Nov 14 13:13:31 2010 +1100
@@ -62,7 +62,6 @@
 SYSCTL_DECL(_net_inet_tcp_cc);
 
 /* CC housekeeping functions. */
-void	cc_init(void);
 int	cc_register_algo(struct cc_algo *add_cc);
 int	cc_deregister_algo(struct cc_algo *remove_cc);
 
diff -r 5c1d68ee8029 sys/netinet/cc/cc.c
--- a/sys/netinet/cc/cc.c	Sat Nov 13 12:52:44 2010 +0000
+++ b/sys/netinet/cc/cc.c	Sun Nov 14 13:13:31 2010 +1100
@@ -176,8 +176,8 @@
 /*
  * Initialise CC subsystem on system boot.
  */
-void
-cc_init()
+static void
+cc_init(void)
 {
 	CC_LIST_LOCK_INIT();
 	STAILQ_INIT(&cc_list);
@@ -328,6 +328,8 @@
 	return (err);
 }
 
+SYSINIT(cc, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST, cc_init, NULL);
+
 /* Declare sysctl tree and populate it. */
 SYSCTL_NODE(_net_inet_tcp, OID_AUTO, cc, CTLFLAG_RW, NULL,
     "congestion control related settings");
diff -r 5c1d68ee8029 sys/netinet/tcp_subr.c
--- a/sys/netinet/tcp_subr.c	Sat Nov 13 12:52:44 2010 +0000
+++ b/sys/netinet/tcp_subr.c	Sun Nov 14 13:13:31 2010 +1100
@@ -278,8 +278,6 @@
 {
 	int hashsize;
 
-	cc_init();
-
 	hashsize = TCBHASHSIZE;
 	TUNABLE_INT_FETCH("net.inet.tcp.tcbhashsize", &hashsize);
 	if (!powerof2(hashsize)) {