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

[Lawrence Stewart]

Author: lstewart
Date: Tue Oct 13 07:00:17 2009
New Revision: 198022
URL: http://svn.freebsd.org/changeset/base/198022

Log:
  Catch up with vimage changes.

Modified:
  projects/tcp_cc_head/sys/netinet/cc.c
  projects/tcp_cc_head/sys/netinet/cc_cubic.c
  projects/tcp_cc_head/sys/netinet/cc_htcp.c
  projects/tcp_cc_head/sys/netinet/cc_newreno.c

Modified: projects/tcp_cc_head/sys/netinet/cc.c
==============================================================================
--- projects/tcp_cc_head/sys/netinet/cc.c	Tue Oct 13 06:25:53 2009	(r198021)
+++ projects/tcp_cc_head/sys/netinet/cc.c	Tue Oct 13 07:00:17 2009	(r198022)
@@ -47,14 +47,15 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 
 #include <netinet/cc.h>
 #include <netinet/cc_module.h>
-#include <netinet/vinet.h>
+#include <netinet/in.h>
+#include <netinet/in_pcb.h>
+#include <netinet/tcp_var.h>
 
 /*
  * List of available cc algorithms on the current system. First element

Modified: projects/tcp_cc_head/sys/netinet/cc_cubic.c
==============================================================================
--- projects/tcp_cc_head/sys/netinet/cc_cubic.c	Tue Oct 13 06:25:53 2009	(r198021)
+++ projects/tcp_cc_head/sys/netinet/cc_cubic.c	Tue Oct 13 07:00:17 2009	(r198022)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/time.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 
@@ -59,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/vinet.h>
 
 int cubic_mod_init(void);
 int cubic_cb_init(struct tcpcb *tp);

Modified: projects/tcp_cc_head/sys/netinet/cc_htcp.c
==============================================================================
--- projects/tcp_cc_head/sys/netinet/cc_htcp.c	Tue Oct 13 06:25:53 2009	(r198021)
+++ projects/tcp_cc_head/sys/netinet/cc_htcp.c	Tue Oct 13 07:00:17 2009	(r198022)
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 
@@ -62,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/vinet.h>
 
 /* useful defines */
 #define MODNAME "HTCP congestion control"

Modified: projects/tcp_cc_head/sys/netinet/cc_newreno.c
==============================================================================
--- projects/tcp_cc_head/sys/netinet/cc_newreno.c	Tue Oct 13 06:25:53 2009	(r198021)
+++ projects/tcp_cc_head/sys/netinet/cc_newreno.c	Tue Oct 13 07:00:17 2009	(r198022)
@@ -37,15 +37,16 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 
 #include <netinet/cc.h>
 #include <netinet/cc_module.h>
+#include <netinet/in.h>
+#include <netinet/in_pcb.h>
 #include <netinet/tcp_seq.h>
-#include <netinet/vinet.h>
+#include <netinet/tcp_var.h>
 
 /*
  * NewReno CC functions