svn commit: r194702 - head/sys/netinet6

[Andrew Gallatin]

Bjoern A. Zeeb wrote:
> Author: bz
> Date: Tue Jun 23 13:22:19 2009
> New Revision: 194702
> URL: http://svn.freebsd.org/changeset/base/194702
> 
> Log:
>   in6_rtqdrain() has been unused.  Cleanup.
>   As this was the only consumer of net/route.h left remove that as well.
> 
> Modified:
>   head/sys/netinet6/in6_rmx.c
> 
> Modified: head/sys/netinet6/in6_rmx.c
> ==============================================================================
> --- head/sys/netinet6/in6_rmx.c	Tue Jun 23 13:17:25 2009	(r194701)
> +++ head/sys/netinet6/in6_rmx.c	Tue Jun 23 13:22:19 2009	(r194702)
> @@ -90,7 +90,6 @@ __FBSDID("$FreeBSD$");
>  #include <sys/vimage.h>
>  
>  #include <net/if.h>
> -#include <net/route.h>
>  #include <net/vnet.h>

My kernel build dies without net/route.h:


cc -c -O2 -frename-registers -pipe -fno-strict-aliasing  -std=c99 -g 
-Wall -Wredundant-decls -Wnested-externs -Wstric
s  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef 
-Wno-pointer-sign -fformat-extensions -nostdinc
../.. -I../../../contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS 
-include opt_global.h -fno-common -finline-limit
am inline-unit-growth=100 --param large-function-growth=1000 
-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone
7 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow  -msoft-float 
-fno-asynchronous-unwind-tables -ffreestanding -fsta
r -Werror  ../../../netinet6/in6_rmx.c
cc1: warnings being treated as errors
../../../netinet6/in6_rmx.c:123: warning: 'struct radix_node_head' 
declared inside parameter list
../../../netinet6/in6_rmx.c:123: warning: its scope is only this 
definition or declaration, which is probably not wha
../../../netinet6/in6_rmx.c: In function 'in6_addroute':
../../../netinet6/in6_rmx.c:126: warning: implicit declaration of 
function 'rt_key'
../../../netinet6/in6_rmx.c:126: warning: nested extern declaration of 
'rt_key'
../../../netinet6/in6_rmx.c:126: warning: cast to pointer from integer 
of different size
../../../netinet6/in6_rmx.c:129: warning: implicit declaration of 
function 'RADIX_NODE_HEAD_WLOCK_ASSERT'
../../../netinet6/in6_rmx.c:129: warning: nested extern declaration of 
'RADIX_NODE_HEAD_WLOCK_ASSERT'
../../../netinet6/in6_rmx.c:131: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:131: error: 'RTF_MULTICAST' undeclared 
(first use in this function)
../../../netinet6/in6_rmx.c:131: error: (Each undeclared identifier is 
reported only once
../../../netinet6/in6_rmx.c:131: error: for each function it appears in.)
../../../netinet6/in6_rmx.c:147: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:147: error: 'RTF_HOST' undeclared (first use 
in this function)
../../../netinet6/in6_rmx.c:148: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:151: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:151: error: 'RTF_LOCAL' undeclared (first 
use in this function)
../../../netinet6/in6_rmx.c:155: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:155: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:156: error: dereferencing pointer to 
incomplete type
../../../netinet6/in6_rmx.c:158: warning: implicit declaration of 
function 'rn_addroute'
../../../netinet6/in6_rmx.c:158: warning: nested extern declaration of 
'rn_addroute'
../../../netinet6/in6_rmx.c:158: warning: assignment makes pointer from 
integer without a cast
../../../netinet6/in6_rmx.c:173: warning: implicit declaration of 
function 'rtalloc1'
../../../netinet6/in6_rmx.c:173: warning: nested extern declaration of 
'rtalloc1'
../../../netinet6/in6_rmx.c:173: error: 'RTF_RNH_LOCKED' undeclared 
(first use in this function)
../../../netinet6/in6_rmx.c:173: warning: assignment makes pointer from 
integer without a cast

Re-instating the net/route.h include fixes the build for me.

Drew