From df2be82cecfdcfe4fe66cafe9b35f2eb7121b532 Mon Sep 17 00:00:00 2001
From: bz <bz@FreeBSD.org>
Date: Fri, 27 Feb 2009 14:12:05 +0000
Subject: 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.
---
 sys/net/bridgestp.c    | 3 +++
 sys/net/if.c           | 1 +
 sys/net/if_ef.c        | 1 +
 sys/net/if_ethersubr.c | 1 +
 sys/net/if_loop.c      | 1 +
 sys/net/if_mib.c       | 3 +++
 sys/net/if_vlan.c      | 2 ++
 sys/net/raw_cb.c       | 3 +++
 sys/net/raw_usrreq.c   | 3 +++
 sys/net/vnet.h         | 3 ---
 10 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'sys/net')

diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 7a75051..11a7fd6 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -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>
diff --git a/sys/net/if.c b/sys/net/if.c
index 6966a51..7e8d90b 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -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"
 
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 11e381e..4b2f923 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -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>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index e74bb74..df52f83 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -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"
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 6ba0aff..d5548fc 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -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>
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index ae9088d..143095a 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -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>
 
 /*
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index bf037fb..dbaa8f8 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -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"
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 1dedff8..408c2d2 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -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>
 
 /*
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 79d3e30..1749c13 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -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);
diff --git a/sys/net/vnet.h b/sys/net/vnet.h
index d3ae5f3..b021608 100644
--- a/sys/net/vnet.h
+++ b/sys/net/vnet.h
@@ -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;
-- 
cgit v1.1