From b7ff2bdc204ec5e815f8123552bb0bee31638f8e Mon Sep 17 00:00:00 2001
From: bz <bz@FreeBSD.org>
Date: Mon, 8 Jun 2009 19:57:35 +0000
Subject: After r193232 rt_tables in vnet.h are no longer indirectly dependent
 on the ROUTETABLES kernel option thus there is no need to include opt_route.h
 anymore in all consumers of vnet.h and no longer depend on it for module
 builds.

Remove the hidden include in flowtable.h as well and leave the two
explicit #includes in ip_input.c and ip_output.c.
---
 sys/netinet6/icmp6.c        | 1 -
 sys/netinet6/in6.c          | 1 -
 sys/netinet6/in6_ifattach.c | 2 --
 sys/netinet6/in6_mcast.c    | 1 -
 sys/netinet6/in6_proto.c    | 1 -
 sys/netinet6/in6_rmx.c      | 2 --
 sys/netinet6/ip6_input.c    | 1 -
 sys/netinet6/ip6_mroute.c   | 1 -
 sys/netinet6/ip6_output.c   | 1 -
 sys/netinet6/nd6.c          | 1 -
 sys/netinet6/nd6_rtr.c      | 1 -
 sys/netinet6/raw_ip6.c      | 1 -
 sys/netinet6/scope6.c       | 2 --
 13 files changed, 16 deletions(-)

(limited to 'sys/netinet6')

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index e9ef879..e2fc21c 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -66,7 +66,6 @@ __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>
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 921618e..9bb3d93 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 1666bec..c5d0729 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c
index 678dda0..4ea8e10 100644
--- a/sys/netinet6/in6_mcast.c
+++ b/sys/netinet6/in6_mcast.c
@@ -36,7 +36,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index e4d280d..7602686 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -67,7 +67,6 @@ __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"
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 4dbdad6..00f833a 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -75,8 +75,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 5166eb4..182b5af 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -66,7 +66,6 @@ __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>
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 79abf1f..e7bec95 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/callout.h>
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 7f6aae4..2755573 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -66,7 +66,6 @@ __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>
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 96c6d01..ce5aa9c 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index eab8951..2160e29 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 43be628..8b5a05c 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index b866cd9..9267230 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-- 
cgit v1.1