From 755a25766d2f8c9aff27e66475f3c2e6c8adca40 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 14 Jul 2017 16:50:42 +0000 Subject: kernels don't build without MROUTING because ip_var.h only sometimes introduces a forward decl for socket. turns out the affected file doesn't need ip_var.h, so remove it. then move the decl to the bottom to prevent the problem from recurring. bug report by Nick Briggs ok mpi --- sys/netinet/ip_var.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sys/netinet') diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index eefa2127262..81c6c0c6a3b 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_var.h,v 1.79 2017/06/26 19:06:12 bluhm Exp $ */ +/* $OpenBSD: ip_var.h,v 1.80 2017/07/14 16:50:41 tedu Exp $ */ /* $NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $ */ /* @@ -193,9 +193,6 @@ struct ipq { extern struct ipstat ipstat; extern LIST_HEAD(ipqhead, ipq) ipq; /* ip reass. queue */ extern int ip_defttl; /* default IP ttl */ -#ifdef MROUTING -extern struct socket *ip_mrouter[]; /* multicast routing daemon */ -#endif #define IPMTUDISCTIMEOUT (10 * 60) /* as per RFC 1191 */ @@ -260,5 +257,9 @@ int rip_usrreq(struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *); int rip_attach(struct socket *, int); +#ifdef MROUTING +extern struct socket *ip_mrouter[]; /* multicast routing daemon */ +#endif + #endif /* _KERNEL */ #endif /* _NETINET_IP_VAR_H_ */ -- cgit v1.2.3