svn commit: r293470 - in head/sys: net net80211 netgraph/netflow netinet netinet6 netpfil/pf

[Nathan Whitehorn]

One or the other of these changes seems to have broken the build of libc:

In file included from 
/usr/home/nwhitehorn/head/lib/libc/net/getifaddrs.c:42:
/usr/obj/usr/home/nwhitehorn/head/tmp/usr/include/net/route.h:226: 
error: dereferencing pointer to incomplete type
-Nathan

On 01/09/16 01:34, Alexander V. Chernikov wrote:
> Author: melifaro
> Date: Sat Jan  9 09:34:39 2016
> New Revision: 293470
> URL: https://svnweb.freebsd.org/changeset/base/293470
>
> Log:
>    Remove sys/eventhandler.h from net/route.h
>    
>    Reviewed by:	ae
>
> Modified:
>    head/sys/net/route.h
>    head/sys/net80211/ieee80211_freebsd.c
>    head/sys/netgraph/netflow/netflow.c
>    head/sys/netgraph/netflow/netflow_v9.c
>    head/sys/netgraph/netflow/ng_netflow.c
>    head/sys/netinet/in_pcb.c
>    head/sys/netinet/ip_encap.c
>    head/sys/netinet/ip_mroute.c
>    head/sys/netinet/raw_ip.c
>    head/sys/netinet/tcp_reass.c
>    head/sys/netinet/tcp_subr.c
>    head/sys/netinet6/frag6.c
>    head/sys/netpfil/pf/pf_if.c
>
> Modified: head/sys/net/route.h
> ==============================================================================
> --- head/sys/net/route.h	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/net/route.h	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -467,7 +467,6 @@ int	rib_lookup_info(uint32_t, const stru
>   	    struct rt_addrinfo *);
>   void	rib_free_info(struct rt_addrinfo *info);
>   
> -#include <sys/eventhandler.h>
>   #endif
>   
>   #endif
>
> Modified: head/sys/net80211/ieee80211_freebsd.c
> ==============================================================================
> --- head/sys/net80211/ieee80211_freebsd.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/net80211/ieee80211_freebsd.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/param.h>
>   #include <sys/kernel.h>
>   #include <sys/systm.h>
> +#include <sys/eventhandler.h>
>   #include <sys/linker.h>
>   #include <sys/mbuf.h>
>   #include <sys/module.h>
>
> Modified: head/sys/netgraph/netflow/netflow.c
> ==============================================================================
> --- head/sys/netgraph/netflow/netflow.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netgraph/netflow/netflow.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/systm.h>
>   #include <sys/counter.h>
>   #include <sys/kernel.h>
> +#include <sys/ktr.h>
>   #include <sys/limits.h>
>   #include <sys/mbuf.h>
>   #include <sys/syslog.h>
>
> Modified: head/sys/netgraph/netflow/netflow_v9.c
> ==============================================================================
> --- head/sys/netgraph/netflow/netflow_v9.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netgraph/netflow/netflow_v9.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/systm.h>
>   #include <sys/counter.h>
>   #include <sys/kernel.h>
> +#include <sys/ktr.h>
>   #include <sys/limits.h>
>   #include <sys/mbuf.h>
>   #include <sys/syslog.h>
>
> Modified: head/sys/netgraph/netflow/ng_netflow.c
> ==============================================================================
> --- head/sys/netgraph/netflow/ng_netflow.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netgraph/netflow/ng_netflow.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/systm.h>
>   #include <sys/counter.h>
>   #include <sys/kernel.h>
> +#include <sys/ktr.h>
>   #include <sys/limits.h>
>   #include <sys/mbuf.h>
>   #include <sys/socket.h>
>
> Modified: head/sys/netinet/in_pcb.c
> ==============================================================================
> --- head/sys/netinet/in_pcb.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netinet/in_pcb.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/malloc.h>
>   #include <sys/mbuf.h>
>   #include <sys/callout.h>
> +#include <sys/eventhandler.h>
>   #include <sys/domain.h>
>   #include <sys/protosw.h>
>   #include <sys/rmlock.h>
>
> Modified: head/sys/netinet/ip_encap.c
> ==============================================================================
> --- head/sys/netinet/ip_encap.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netinet/ip_encap.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -65,6 +65,8 @@ __FBSDID("$FreeBSD$");
>   
>   #include <sys/param.h>
>   #include <sys/systm.h>
> +#include <sys/lock.h>
> +#include <sys/mutex.h>
>   #include <sys/socket.h>
>   #include <sys/sockio.h>
>   #include <sys/mbuf.h>
>
> Modified: head/sys/netinet/ip_mroute.c
> ==============================================================================
> --- head/sys/netinet/ip_mroute.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netinet/ip_mroute.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/param.h>
>   #include <sys/kernel.h>
>   #include <sys/stddef.h>
> +#include <sys/eventhandler.h>
>   #include <sys/lock.h>
>   #include <sys/ktr.h>
>   #include <sys/malloc.h>
>
> Modified: head/sys/netinet/raw_ip.c
> ==============================================================================
> --- head/sys/netinet/raw_ip.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netinet/raw_ip.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/param.h>
>   #include <sys/jail.h>
>   #include <sys/kernel.h>
> +#include <sys/eventhandler.h>
>   #include <sys/lock.h>
>   #include <sys/malloc.h>
>   #include <sys/mbuf.h>
>
> Modified: head/sys/netinet/tcp_reass.c
> ==============================================================================
> --- head/sys/netinet/tcp_reass.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netinet/tcp_reass.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
>   
>   #include <sys/param.h>
>   #include <sys/kernel.h>
> +#include <sys/eventhandler.h>
>   #include <sys/malloc.h>
>   #include <sys/mbuf.h>
>   #include <sys/socket.h>
>
> Modified: head/sys/netinet/tcp_subr.c
> ==============================================================================
> --- head/sys/netinet/tcp_subr.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netinet/tcp_subr.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/param.h>
>   #include <sys/systm.h>
>   #include <sys/callout.h>
> +#include <sys/eventhandler.h>
>   #include <sys/hhook.h>
>   #include <sys/kernel.h>
>   #include <sys/khelp.h>
>
> Modified: head/sys/netinet6/frag6.c
> ==============================================================================
> --- head/sys/netinet6/frag6.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netinet6/frag6.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
>   #include <sys/malloc.h>
>   #include <sys/mbuf.h>
>   #include <sys/domain.h>
> +#include <sys/eventhandler.h>
>   #include <sys/protosw.h>
>   #include <sys/socket.h>
>   #include <sys/errno.h>
>
> Modified: head/sys/netpfil/pf/pf_if.c
> ==============================================================================
> --- head/sys/netpfil/pf/pf_if.c	Sat Jan  9 09:33:24 2016	(r293469)
> +++ head/sys/netpfil/pf/pf_if.c	Sat Jan  9 09:34:39 2016	(r293470)
> @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
>   
>   #include <sys/param.h>
>   #include <sys/kernel.h>
> +#include <sys/eventhandler.h>
>   #include <sys/lock.h>
>   #include <sys/mbuf.h>
>   #include <sys/rwlock.h>
>