From owner-svn-src-projects@FreeBSD.ORG  Tue Oct 13 07:00:17 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD9EE1065672;
	Tue, 13 Oct 2009 07:00:17 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB3E48FC12;
	Tue, 13 Oct 2009 07:00:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9D70HrK097626;
	Tue, 13 Oct 2009 07:00:17 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9D70HPY097621;
	Tue, 13 Oct 2009 07:00:17 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200910130700.n9D70HPY097621@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Tue, 13 Oct 2009 07:00:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198022 - projects/tcp_cc_head/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 07:00:18 -0000

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