From owner-svn-src-all@FreeBSD.ORG  Wed Jun 17 12:44:12 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 987EE106564A;
	Wed, 17 Jun 2009 12:44:12 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D4D18FC0C;
	Wed, 17 Jun 2009 12:44:12 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HCiCPZ075855;
	Wed, 17 Jun 2009 12:44:12 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HCiCdW075848;
	Wed, 17 Jun 2009 12:44:12 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200906171244.n5HCiCdW075848@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 17 Jun 2009 12:44:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194357 - in head/sys: fs/nfs net netinet netipsec
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2009 12:44:13 -0000

Author: bz
Date: Wed Jun 17 12:44:11 2009
New Revision: 194357
URL: http://svn.freebsd.org/changeset/base/194357

Log:
  Add the explicit include of vimage.h to another five .c files still
  missing it.
  
  Remove the "hidden" kernel only include of vimage.h from ip_var.h added
  with the very first Vimage commit r181803 to avoid further kernel poisoning.

Modified:
  head/sys/fs/nfs/nfsport.h
  head/sys/net/if_enc.c
  head/sys/net/if_gre.c
  head/sys/netinet/in_proto.c
  head/sys/netinet/ip_var.h
  head/sys/netipsec/xform_tcp.c

Modified: head/sys/fs/nfs/nfsport.h
==============================================================================
--- head/sys/fs/nfs/nfsport.h	Wed Jun 17 12:43:04 2009	(r194356)
+++ head/sys/fs/nfs/nfsport.h	Wed Jun 17 12:44:11 2009	(r194357)
@@ -78,6 +78,7 @@
 #include <sys/priv.h>
 #include <sys/kthread.h>
 #include <sys/syscallsubr.h>
+#include <sys/vimage.h>
 #include <fs/fifofs/fifo.h>
 #include <net/if.h>
 #include <net/radix.h>

Modified: head/sys/net/if_enc.c
==============================================================================
--- head/sys/net/if_enc.c	Wed Jun 17 12:43:04 2009	(r194356)
+++ head/sys/net/if_enc.c	Wed Jun 17 12:44:11 2009	(r194357)
@@ -38,6 +38,7 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_clone.h>

Modified: head/sys/net/if_gre.c
==============================================================================
--- head/sys/net/if_gre.c	Wed Jun 17 12:43:04 2009	(r194356)
+++ head/sys/net/if_gre.c	Wed Jun 17 12:44:11 2009	(r194357)
@@ -64,6 +64,7 @@
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/vimage.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>

Modified: head/sys/netinet/in_proto.c
==============================================================================
--- head/sys/netinet/in_proto.c	Wed Jun 17 12:43:04 2009	(r194356)
+++ head/sys/netinet/in_proto.c	Wed Jun 17 12:44:11 2009	(r194357)
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/route.h>

Modified: head/sys/netinet/ip_var.h
==============================================================================
--- head/sys/netinet/ip_var.h	Wed Jun 17 12:43:04 2009	(r194356)
+++ head/sys/netinet/ip_var.h	Wed Jun 17 12:44:11 2009	(r194357)
@@ -34,9 +34,6 @@
 #define	_NETINET_IP_VAR_H_
 
 #include <sys/queue.h>
-#ifdef _KERNEL
-#include <sys/vimage.h>
-#endif
 
 /*
  * Overlay for ip header used by other protocols (tcp, udp).

Modified: head/sys/netipsec/xform_tcp.c
==============================================================================
--- head/sys/netipsec/xform_tcp.c	Wed Jun 17 12:43:04 2009	(r194356)
+++ head/sys/netipsec/xform_tcp.c	Wed Jun 17 12:44:11 2009	(r194357)
@@ -39,6 +39,7 @@
 #include <sys/kernel.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>