diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pfkeyv2_parsemessage.c | 3 | ||||
| -rw-r--r-- | sys/netinet/ip_var.h | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/pfkeyv2_parsemessage.c b/sys/net/pfkeyv2_parsemessage.c index 9b04b37de9d..30aef0b2920 100644 --- a/sys/net/pfkeyv2_parsemessage.c +++ b/sys/net/pfkeyv2_parsemessage.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2_parsemessage.c,v 1.52 2017/06/26 09:17:55 patrick Exp $ */ +/* $OpenBSD: pfkeyv2_parsemessage.c,v 1.53 2017/07/14 16:50:41 tedu Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 @@ -76,7 +76,6 @@ #include <sys/mbuf.h> #include <sys/proc.h> #include <netinet/ip_ipsp.h> -#include <netinet/ip_var.h> #include <net/pfkeyv2.h> #if NPF > 0 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_ */ |