From owner-svn-src-head@FreeBSD.ORG  Fri Feb 27 14:12:07 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 80E901065678;
	Fri, 27 Feb 2009 14:12:07 +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 6ADEE8FC16;
	Fri, 27 Feb 2009 14:12:07 +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 n1REC76Q072552;
	Fri, 27 Feb 2009 14:12:07 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1REC5JD072503;
	Fri, 27 Feb 2009 14:12:05 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200902271412.n1REC5JD072503@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Fri, 27 Feb 2009 14:12:05 +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: r189106 - in head/sys: compat/linprocfs compat/linux
	compat/svr4 contrib/altq/altq contrib/pf/net
	dev/cxgb/ulp/iw_cxgb kern net net80211 netgraph netgraph/atm
	netinet netinet6 netipsec ...
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2009 14:12:08 -0000

Author: bz
Date: Fri Feb 27 14:12:05 2009
New Revision: 189106
URL: http://svn.freebsd.org/changeset/base/189106

Log:
  For all files including net/vnet.h directly include opt_route.h and
  net/route.h.
  
  Remove the hidden include of opt_route.h and net/route.h from net/vnet.h.
  
  We need to make sure that both opt_route.h and net/route.h are included
  before net/vnet.h because of the way MRT figures out the number of FIBs
  from the kernel option. If we do not, we end up with the default number
  of 1 when including net/vnet.h and array sizes are wrong.
  
  This does not change the list of files which depend on opt_route.h
  but we can identify them now more easily.

Modified:
  head/sys/compat/linprocfs/linprocfs.c
  head/sys/compat/linux/linux_ioctl.c
  head/sys/compat/svr4/svr4_sockio.c
  head/sys/contrib/altq/altq/altq_subr.c
  head/sys/contrib/pf/net/pf_if.c
  head/sys/contrib/pf/net/pf_ioctl.c
  head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  head/sys/kern/kern_poll.c
  head/sys/kern/kern_uuid.c
  head/sys/net/bridgestp.c
  head/sys/net/if.c
  head/sys/net/if_ef.c
  head/sys/net/if_ethersubr.c
  head/sys/net/if_loop.c
  head/sys/net/if_mib.c
  head/sys/net/if_vlan.c
  head/sys/net/raw_cb.c
  head/sys/net/raw_usrreq.c
  head/sys/net/vnet.h
  head/sys/net80211/ieee80211_ddb.c
  head/sys/netgraph/atm/ng_atm.c
  head/sys/netgraph/ng_ether.c
  head/sys/netgraph/ng_gif.c
  head/sys/netinet/if_ether.c
  head/sys/netinet/igmp.c
  head/sys/netinet/in_mcast.c
  head/sys/netinet/in_proto.c
  head/sys/netinet/in_rmx.c
  head/sys/netinet/ip_fw2.c
  head/sys/netinet/ip_input.c
  head/sys/netinet/ip_output.c
  head/sys/netinet/raw_ip.c
  head/sys/netinet/sctp_os_bsd.h
  head/sys/netinet6/icmp6.c
  head/sys/netinet6/in6.c
  head/sys/netinet6/in6_ifattach.c
  head/sys/netinet6/in6_proto.c
  head/sys/netinet6/in6_rmx.c
  head/sys/netinet6/ip6_input.c
  head/sys/netinet6/ip6_mroute.c
  head/sys/netinet6/ip6_output.c
  head/sys/netinet6/nd6.c
  head/sys/netinet6/nd6_rtr.c
  head/sys/netinet6/raw_ip6.c
  head/sys/netinet6/scope6.c
  head/sys/netipsec/keysock.c
  head/sys/netipsec/xform_ipip.c
  head/sys/nfsclient/bootp_subr.c
  head/sys/nfsclient/nfs_diskless.c

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/compat/linprocfs/linprocfs.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -39,6 +39,7 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  */
 
+#include "opt_route.h"
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>
@@ -76,6 +77,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vimage.h>
 
 #include <net/if.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #include <vm/vm.h>

Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/compat/linux/linux_ioctl.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_route.h"
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>
@@ -63,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #ifdef COMPAT_LINUX32

Modified: head/sys/compat/svr4/svr4_sockio.c
==============================================================================
--- head/sys/compat/svr4/svr4_sockio.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/compat/svr4/svr4_sockio.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -29,6 +29,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
@@ -39,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vimage.h>
 
 #include <net/if.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #include <compat/svr4/svr4.h>

Modified: head/sys/contrib/altq/altq/altq_subr.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_subr.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/contrib/altq/altq/altq_subr.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -32,6 +32,7 @@
 #include "opt_inet.h"
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
+#include "opt_route.h"
 #endif
 #endif /* __FreeBSD__ || __NetBSD__ */
 
@@ -54,7 +55,10 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#ifdef __FreeBSD__
+#include <net/route.h>
 #include <net/vnet.h>
+#endif
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

Modified: head/sys/contrib/pf/net/pf_if.c
==============================================================================
--- head/sys/contrib/pf/net/pf_if.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/contrib/pf/net/pf_if.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -35,6 +35,7 @@
 #if defined(__FreeBSD__)
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_route.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -61,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #ifdef __FreeBSD__
+#include <net/route.h>
 #include <net/vnet.h>
 #endif
 

Modified: head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- head/sys/contrib/pf/net/pf_ioctl.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/contrib/pf/net/pf_ioctl.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -36,14 +36,12 @@
  */
 
 #ifdef __FreeBSD__
-#include "opt_inet.h"
-#include "opt_inet6.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-#endif
 
-#ifdef __FreeBSD__
+#include "opt_inet.h"
+#include "opt_inet6.h"
+#include "opt_route.h"
 #include "opt_bpf.h"
 #include "opt_pf.h"
 

Modified: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
==============================================================================
--- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -29,6 +29,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -63,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_var.h>
 #if __FreeBSD_version >= 800056
+#include <net/route.h>
 #include <net/vnet.h>
 #endif
 

Modified: head/sys/kern/kern_poll.c
==============================================================================
--- head/sys/kern/kern_poll.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/kern/kern_poll.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -28,6 +28,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
 #include "opt_device_polling.h"
 
 #include <sys/param.h>
@@ -44,6 +45,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>			/* for IFF_* flags		*/
 #include <net/netisr.h>			/* for NETISR_POLL		*/
+#include <net/route.h>
 #include <net/vnet.h>
 
 static void netisr_poll(void);		/* the two netisr handlers      */

Modified: head/sys/kern/kern_uuid.c
==============================================================================
--- head/sys/kern/kern_uuid.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/kern/kern_uuid.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
@@ -42,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 /*

Modified: head/sys/net/bridgestp.c
==============================================================================
--- head/sys/net/bridgestp.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/bridgestp.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -37,6 +37,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -56,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_types.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/if.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -33,6 +33,7 @@
 #include "opt_compat.h"
 #include "opt_inet6.h"
 #include "opt_inet.h"
+#include "opt_route.h"
 #include "opt_mac.h"
 #include "opt_carp.h"
 

Modified: head/sys/net/if_ef.c
==============================================================================
--- head/sys/net/if_ef.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/if_ef.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -29,6 +29,7 @@
 #include "opt_inet.h"
 #include "opt_ipx.h"
 #include "opt_ef.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/if_ethersubr.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -34,6 +34,7 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
+#include "opt_route.h"
 #include "opt_mac.h"
 #include "opt_netgraph.h"
 #include "opt_carp.h"

Modified: head/sys/net/if_loop.c
==============================================================================
--- head/sys/net/if_loop.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/if_loop.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -38,6 +38,7 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
+#include "opt_route.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>

Modified: head/sys/net/if_mib.c
==============================================================================
--- head/sys/net/if_mib.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/if_mib.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -29,6 +29,8 @@
  * $FreeBSD$
  */
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -38,6 +40,7 @@
 
 #include <net/if.h>
 #include <net/if_mib.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 /*

Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/if_vlan.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -41,6 +41,7 @@
  * and ask it to send them.
  */
 
+#include "opt_route.h"
 #include "opt_vlan.h"
 
 #include <sys/param.h>
@@ -64,6 +65,7 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #define VLANNAME	"vlan"

Modified: head/sys/net/raw_cb.c
==============================================================================
--- head/sys/net/raw_cb.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/raw_cb.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -31,6 +31,8 @@
  * $FreeBSD$
  */
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/lock.h>
@@ -46,6 +48,7 @@
 
 #include <net/if.h>
 #include <net/raw_cb.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 /*

Modified: head/sys/net/raw_usrreq.c
==============================================================================
--- head/sys/net/raw_usrreq.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/raw_usrreq.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -31,6 +31,8 @@
  * $FreeBSD$
  */
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
@@ -48,6 +50,7 @@
 
 #include <net/if.h>
 #include <net/raw_cb.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF);

Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net/vnet.h	Fri Feb 27 14:12:05 2009	(r189106)
@@ -33,10 +33,7 @@
 #ifndef _NET_VNET_H_
 #define _NET_VNET_H_
 
-#include "opt_route.h"
-
 #include <net/if_var.h>
-#include <net/route.h>
 
 struct vnet_net {
 	int	_if_index;

Modified: head/sys/net80211/ieee80211_ddb.c
==============================================================================
--- head/sys/net80211/ieee80211_ddb.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/net80211/ieee80211_ddb.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -27,6 +27,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_route.h"
 #include "opt_wlan.h"
 
 #ifdef DDB
@@ -44,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #include <net80211/ieee80211_var.h>

Modified: head/sys/netgraph/atm/ng_atm.c
==============================================================================
--- head/sys/netgraph/atm/ng_atm.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netgraph/atm/ng_atm.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -34,6 +34,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -54,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netgraph/ng_message.h>

Modified: head/sys/netgraph/ng_ether.c
==============================================================================
--- head/sys/netgraph/ng_ether.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netgraph/ng_ether.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -46,6 +46,8 @@
  * ng_ether(4) netgraph node type
  */
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -63,6 +65,7 @@
 #include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_bridgevar.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netgraph/ng_message.h>

Modified: head/sys/netgraph/ng_gif.c
==============================================================================
--- head/sys/netgraph/ng_gif.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netgraph/ng_gif.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -68,6 +68,7 @@
 /*
  * ng_gif(4) netgraph node type
  */
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/if_ether.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -39,6 +39,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
+#include "opt_route.h"
 #include "opt_mac.h"
 #include "opt_carp.h"
 

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/igmp.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -48,6 +48,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_mac.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet/in_mcast.c
==============================================================================
--- head/sys/netinet/in_mcast.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/in_mcast.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -39,6 +39,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet/in_proto.c
==============================================================================
--- head/sys/netinet/in_proto.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/in_proto.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_mrouting.h"
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
+#include "opt_route.h"
 #include "opt_pf.h"
 #include "opt_carp.h"
 #include "opt_sctp.h"

Modified: head/sys/netinet/in_rmx.c
==============================================================================
--- head/sys/netinet/in_rmx.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/in_rmx.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -43,6 +43,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet/ip_fw2.c
==============================================================================
--- head/sys/netinet/ip_fw2.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/ip_fw2.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #include "opt_mac.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/ip_input.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_ipfw.h"
 #include "opt_ipstealth.h"
 #include "opt_ipsec.h"
+#include "opt_route.h"
 #include "opt_mac.h"
 #include "opt_carp.h"
 

Modified: head/sys/netinet/ip_output.c
==============================================================================
--- head/sys/netinet/ip_output.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/ip_output.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_ipfw.h"
 #include "opt_inet.h"
 #include "opt_ipsec.h"
+#include "opt_route.h"
 #include "opt_mac.h"
 #include "opt_mbuf_stress_test.h"
 #include "opt_mpath.h"

Modified: head/sys/netinet/raw_ip.c
==============================================================================
--- head/sys/netinet/raw_ip.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/raw_ip.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
+#include "opt_route.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>

Modified: head/sys/netinet/sctp_os_bsd.h
==============================================================================
--- head/sys/netinet/sctp_os_bsd.h	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet/sctp_os_bsd.h	Fri Feb 27 14:12:05 2009	(r189106)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_compat.h"
 #include "opt_inet6.h"
 #include "opt_inet.h"
+#include "opt_route.h"
 #include "opt_sctp.h"
 
 #include <sys/param.h>

Modified: head/sys/netinet6/icmp6.c
==============================================================================
--- head/sys/netinet6/icmp6.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/icmp6.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/in6.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/errno.h>

Modified: head/sys/netinet6/in6_ifattach.c
==============================================================================
--- head/sys/netinet6/in6_ifattach.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/in6_ifattach.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -32,6 +32,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

Modified: head/sys/netinet6/in6_proto.c
==============================================================================
--- head/sys/netinet6/in6_proto.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/in6_proto.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #include "opt_ipstealth.h"
+#include "opt_route.h"
 #include "opt_carp.h"
 #include "opt_sctp.h"
 #include "opt_mpath.h"

Modified: head/sys/netinet6/in6_rmx.c
==============================================================================
--- head/sys/netinet6/in6_rmx.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/in6_rmx.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -75,6 +75,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet6/ip6_input.c
==============================================================================
--- head/sys/netinet6/ip6_input.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/ip6_input.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet6/ip6_mroute.c
==============================================================================
--- head/sys/netinet6/ip6_mroute.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/ip6_mroute.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/callout.h>

Modified: head/sys/netinet6/ip6_output.c
==============================================================================
--- head/sys/netinet6/ip6_output.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/ip6_output.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/nd6.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_mac.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/nd6_rtr.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet6/raw_ip6.c
==============================================================================
--- head/sys/netinet6/raw_ip6.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/raw_ip6.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/errno.h>

Modified: head/sys/netinet6/scope6.c
==============================================================================
--- head/sys/netinet6/scope6.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netinet6/scope6.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -32,6 +32,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
+
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>

Modified: head/sys/netipsec/keysock.c
==============================================================================
--- head/sys/netipsec/keysock.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netipsec/keysock.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -31,6 +31,7 @@
  */
 
 #include "opt_ipsec.h"
+#include "opt_route.h"
 
 /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
 

Modified: head/sys/netipsec/xform_ipip.c
==============================================================================
--- head/sys/netipsec/xform_ipip.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/netipsec/xform_ipip.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -41,6 +41,7 @@
  */
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_route.h"
 #include "opt_enc.h"
 
 #include <sys/param.h>

Modified: head/sys/nfsclient/bootp_subr.c
==============================================================================
--- head/sys/nfsclient/bootp_subr.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/nfsclient/bootp_subr.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -43,6 +43,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
 #include "opt_bootp.h"
 
 #include <sys/param.h>

Modified: head/sys/nfsclient/nfs_diskless.c
==============================================================================
--- head/sys/nfsclient/nfs_diskless.c	Fri Feb 27 13:29:18 2009	(r189105)
+++ head/sys/nfsclient/nfs_diskless.c	Fri Feb 27 14:12:05 2009	(r189106)
@@ -35,6 +35,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_route.h"
 #include "opt_bootp.h"
 
 #include <sys/param.h>
@@ -50,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_types.h>
 #include <net/if_var.h>
 #include <net/ethernet.h>
+#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>