Merge r198022 from projects/tcp_cc_head:

Catch up with vimage changes.
freebsd · Oct 13, 2009 · c33524c · c33524c
1 parent 3ba5340
commit c33524c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/sys/netinet/cc.c b/sys/netinet/cc.c
@@ -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

diff --git a/sys/netinet/cc_cubic.c b/sys/netinet/cc_cubic.c
@@ -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);

diff --git a/sys/netinet/cc_htcp.c b/sys/netinet/cc_htcp.c
@@ -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"

diff --git a/sys/netinet/cc_newreno.c b/sys/netinet/cc_newreno.c
@@ -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