diff options
| author |   mpi <mpi@openbsd.org> | 2015-11-12 16:34:13 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-11-12 16:34:13 +0000 |
| commit | ef397f5a2df9ff5eedfb6b4221d6ba2c1d51b22f (patch) | |
| tree | c53af2f5a33cfd1b3af5999b9b1cc85801f60357 /sys | |
| parent | Remove xfree()'s prototype. tedu@ removed its definition a few weeks (diff) | |
| download | wireguard-openbsd-ef397f5a2df9ff5eedfb6b4221d6ba2c1d51b22f.tar.xz wireguard-openbsd-ef397f5a2df9ff5eedfb6b4221d6ba2c1d51b22f.zip | |
Fix PIM build.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/ip_mroute.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_mroute.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index ab76452a2eb..2b832d41f6d 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_mroute.c,v 1.82 2015/09/12 13:34:12 mpi Exp $ */ +/* $OpenBSD: ip_mroute.c,v 1.83 2015/11/12 16:34:13 mpi Exp $ */ /* $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $ */ /* @@ -2201,7 +2201,7 @@ pim_input(struct mbuf *m, ...) reg_vif_num); } /* NB: vifp was collected above; can it change on us? */ - if_input_local(vifp, m, dst->sin_family); + if_input_local(vifp, m, dst.sin_family); /* prepare the register head to send to the mrouting daemon */ m = mcp; diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 22be5890e39..4cd0cdb2940 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -103,13 +103,15 @@ #include <netinet/in.h> #include <netinet/icmp6.h> - #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/ip6_mroute.h> + +#ifdef PIM +#include <netinet/pim.h> #include <netinet6/pim6_var.h> -#include <netinet6/nd6.h> +#endif int ip6_mdq(struct mbuf *, struct ifnet *, struct mf6c *); void phyint_send6(struct ip6_hdr *, struct mif6 *, struct mbuf *); @@ -1899,7 +1901,7 @@ pim6_input(struct mbuf **mp, int *offp, int proto) #endif if_input_local(mif6table[reg_mif_num].m6_ifp, m, - dst->sin6_family); + dst.sin6_family); /* prepare the register head to send to the mrouting daemon */ m = mcp; |