diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-08-19 12:28:04 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-08-19 12:28:04 +0000 |
| commit | e0fa1ba0648a04e0a11a3ca2e2a410e7c1e0c737 (patch) | |
| tree | 4764a5b2841d05d2a6392083d612ad84e71e21e5 /sys | |
| parent | 270a6d367d98a55cfeb38319c73a001964f6b820 (diff) | |
Keep pim code under #ifdef PIM to be coherent with what's in netinet/.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet6/in6_proto.c | 8 | ||||
| -rw-r--r-- | sys/netinet6/ip6_mroute.c | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index e81cdf6cad4..04e0a530b54 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.73 2014/07/22 11:06:10 mpi Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.74 2014/08/19 12:28:03 mpi Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -93,7 +93,7 @@ #include <netinet/ip_esp.h> #include <netinet/ip_ipip.h> -#ifdef MROUTING +#ifdef PIM #include <netinet6/pim6_var.h> #endif @@ -223,13 +223,13 @@ struct ip6protosw inet6sw[] = { }, #endif /* INET */ #endif /* GIF */ -#ifdef MROUTING +#ifdef PIM { SOCK_RAW, &inet6domain, IPPROTO_PIM, PR_ATOMIC|PR_ADDR, pim6_input, rip6_output, 0, rip6_ctloutput, rip6_usrreq, 0, 0, 0, 0, pim6_sysctl }, -#endif +#endif /* PIM */ #if NCARP > 0 { SOCK_RAW, &inet6domain, IPPROTO_CARP, PR_ATOMIC|PR_ADDR, carp6_proto_input, rip6_output, 0, rip6_ctloutput, diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 09bfd60e28f..e43d1506145 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -1578,6 +1578,8 @@ register_send(struct ip6_hdr *ip6, struct mif6 *mif, struct mbuf *m) return 0; } +#ifdef PIM + /* * PIM sparse mode hook * Receives the pim control messages, and passes them up to the listening @@ -1835,3 +1837,4 @@ pim6_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, } /* NOTREACHED */ } +#endif /* PIM */ |