svn commit: r188049 - projects/tcp_cc_8.x/sys/netinet

[Lawrence Stewart]

Author: lstewart
Date: Tue Feb  3 06:08:58 2009
New Revision: 188049
URL: http://svn.freebsd.org/changeset/base/188049

Log:
  More header related cleanup.

Modified:
  projects/tcp_cc_8.x/sys/netinet/cc.c
  projects/tcp_cc_8.x/sys/netinet/cc.h
  projects/tcp_cc_8.x/sys/netinet/cc_cubic.c
  projects/tcp_cc_8.x/sys/netinet/cc_htcp.c
  projects/tcp_cc_8.x/sys/netinet/tcp_output.c
  projects/tcp_cc_8.x/sys/netinet/tcp_subr.c
  projects/tcp_cc_8.x/sys/netinet/tcp_timer.c
  projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c

Modified: projects/tcp_cc_8.x/sys/netinet/cc.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/cc.c	Tue Feb  3 05:50:36 2009	(r188048)
+++ projects/tcp_cc_8.x/sys/netinet/cc.c	Tue Feb  3 06:08:58 2009	(r188049)
@@ -35,15 +35,17 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/kernel.h>
 #include <sys/libkern.h>
 #include <sys/lock.h>
-#include <sys/rwlock.h>
-#include <sys/mutex.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
+#include <sys/mutex.h>
+#include <sys/queue.h>
+#include <sys/rwlock.h>
 #include <sys/sbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_var.h>

Modified: projects/tcp_cc_8.x/sys/netinet/cc.h
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/cc.h	Tue Feb  3 05:50:36 2009	(r188048)
+++ projects/tcp_cc_8.x/sys/netinet/cc.h	Tue Feb  3 06:08:58 2009	(r188049)
@@ -34,14 +34,9 @@
 #ifndef _NETINET_CC_H_
 #define _NETINET_CC_H_
 
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-
+/* Needed for TCP_CA_NAME_MAX define which lives in tcp.h for compat reasons */
 #include <netinet/tcp.h>
 
-/* Forward declaration of required structs. */
-struct tcpcb;
-
 /*
  * Global CC vars
  */

Modified: projects/tcp_cc_8.x/sys/netinet/cc_cubic.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/cc_cubic.c	Tue Feb  3 05:50:36 2009	(r188048)
+++ projects/tcp_cc_8.x/sys/netinet/cc_cubic.c	Tue Feb  3 06:08:58 2009	(r188049)
@@ -44,12 +44,15 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/sysctl.h>
 #include <sys/time.h>
 
 #include <netinet/cc.h>
 #include <netinet/cc_cubic.h>
+#include <netinet/tcp.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>

Modified: projects/tcp_cc_8.x/sys/netinet/cc_htcp.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/cc_htcp.c	Tue Feb  3 05:50:36 2009	(r188048)
+++ projects/tcp_cc_8.x/sys/netinet/cc_htcp.c	Tue Feb  3 06:08:58 2009	(r188049)
@@ -44,11 +44,13 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
 
 #include <netinet/cc.h>
 #include <netinet/tcp_seq.h>

Modified: projects/tcp_cc_8.x/sys/netinet/tcp_output.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/tcp_output.c	Tue Feb  3 05:50:36 2009	(r188048)
+++ projects/tcp_cc_8.x/sys/netinet/tcp_output.c	Tue Feb  3 06:08:58 2009	(r188049)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/route.h>
 
+#include <netinet/cc.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -65,14 +66,12 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif
-#include <netinet/tcp.h>
 #define	TCPOUTFLAGS
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
-#include <netinet/cc.h>
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif

Modified: projects/tcp_cc_8.x/sys/netinet/tcp_subr.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/tcp_subr.c	Tue Feb  3 05:50:36 2009	(r188048)
+++ projects/tcp_cc_8.x/sys/netinet/tcp_subr.c	Tue Feb  3 06:08:58 2009	(r188049)
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <net/route.h>
 #include <net/if.h>
 
+#include <netinet/cc.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -82,14 +83,12 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/nd6.h>
 #endif
 #include <netinet/ip_icmp.h>
-#include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_syncache.h>
 #include <netinet/tcp_offload.h>
-#include <netinet/cc.h>
 #ifdef INET6
 #include <netinet6/tcp6_var.h>
 #endif

Modified: projects/tcp_cc_8.x/sys/netinet/tcp_timer.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/tcp_timer.c	Tue Feb  3 05:50:36 2009	(r188048)
+++ projects/tcp_cc_8.x/sys/netinet/tcp_timer.c	Tue Feb  3 06:08:58 2009	(r188049)
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/route.h>
 
+#include <netinet/cc.h>
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
 #include <netinet/in_systm.h>
@@ -57,12 +58,10 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/in6_pcb.h>
 #endif
 #include <netinet/ip_var.h>
-#include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
-#include <netinet/cc.h>
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif

Modified: projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c	Tue Feb  3 05:50:36 2009	(r188048)
+++ projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c	Tue Feb  3 06:08:58 2009	(r188049)
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/route.h>
 
+#include <netinet/cc.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #ifdef INET6
@@ -77,13 +78,11 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/ip6_var.h>
 #include <netinet6/scope6_var.h>
 #endif
-#include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
-#include <netinet/cc.h>
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif