diff options
| author |   florian <florian@openbsd.org> | 2017-07-08 15:45:11 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2017-07-08 15:45:11 +0000 |
| commit | 569c7b0bd5949dcd61334cd258584263ee67079c (patch) | |
| tree | 091d8c115de13d45eb66afecfb23ac554d7e8635 /sys/netinet6 | |
| parent | hook up slaacd to the installer on media where we have INET6 (diff) | |
| download | wireguard-openbsd-569c7b0bd5949dcd61334cd258584263ee67079c.tar.xz wireguard-openbsd-569c7b0bd5949dcd61334cd258584263ee67079c.zip | |
Enable slaacd on the installer and temporarily neuter router
advertisement processing and solicitation sending like we already did
for the non-install kernels.
Next step will be to tedu all that code from the kernel.
OK rpe@ for the installer bits
move forward deraadt@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index ff087ae81b8..4879c9643dd 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.161 2017/06/09 12:56:44 mpi Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.162 2017/07/08 15:45:11 florian Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -282,9 +282,7 @@ nd6_rs_output(struct ifnet* ifp, struct in6_ifaddr *ia6) void nd6_rs_output_set_timo(int timeout) { -#ifndef SMALL_KERNEL return; -#endif /* SMALL_KERNEL */ nd6_rs_output_timeout = timeout; timeout_add_sec(&nd6_rs_output_timer, nd6_rs_output_timeout); } @@ -384,9 +382,7 @@ nd6_ra_input(struct mbuf *m, int off, int icmp6len) if (ifp == NULL) goto freeit; -#ifndef SMALL_KERNEL goto freeit; -#endif /* SMALL_KERNEL */ /* We accept RAs only if inet6 autoconf is enabled */ if (!(ifp->if_xflags & IFXF_AUTOCONF6)) |