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/netgraph/atm/ng_atm.c | 3 +++
 sys/netgraph/ng_ether.c   | 3 +++
 sys/netgraph/ng_gif.c     | 1 +
 3 files changed, 7 insertions(+)

(limited to 'sys/netgraph')

diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c
index e5e1e2e..88c8cf0 100644
--- a/sys/netgraph/atm/ng_atm.c
+++ b/sys/netgraph/atm/ng_atm.c
@@ -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>
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index c03befc..aaf4372 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -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>
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 9a2d3b9..5b59fed 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -68,6 +68,7 @@
 /*
  * ng_gif(4) netgraph node type
  */
+#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-- 
cgit v1.1