diff options
author | Brad Smith <brad@cvs.openbsd.org> | 2015-03-03 07:54:33 +0000 |
---|---|---|
committer | Brad Smith <brad@cvs.openbsd.org> | 2015-03-03 07:54:33 +0000 |
commit | ab65d0e9076abd3d2d27f488c3ae7ea916f25e44 (patch) | |
tree | 132056172cb64460a80d9555f108deea68dd1954 /sys/net/if.c | |
parent | ad0bda653a68a9735f3bea0248e9d1fac984cc2a (diff) |
Fix a regression introduced when switching from rtsold to the kernel for
router solicitations. Send the router soliciation right away instead of
having a 60 second window between enabling SLAAC on the interface and the
router solicitation being sent.
ok florian@ stsp@ mpi@
Diffstat (limited to 'sys/net/if.c')
-rw-r--r-- | sys/net/if.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 1bd00d9db0e..a4ccf596609 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.319 2015/02/09 03:09:57 dlg Exp $ */ +/* $OpenBSD: if.c,v 1.320 2015/03/03 07:54:32 brad Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -1351,7 +1351,8 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) RS_LHCOOKIE(ifp) = hook_establish( ifp->if_linkstatehooks, 1, nd6_rs_dev_state, ifp); if (!timeout_pending(&nd6_rs_output_timer)) - nd6_rs_output_set_timo(nd6_rs_output_timeout); + nd6_rs_output_set_timo( + ND6_RS_OUTPUT_QUICK_INTERVAL); } if ((ifp->if_xflags & IFXF_AUTOCONF6) && |