diff options
| author |   mpi <mpi@openbsd.org> | 2016-11-15 13:12:24 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-11-15 13:12:24 +0000 |
| commit | d5a6057654c160cf2a98cd20a3313660fcfba1ef (patch) | |
| tree | 4df4d9bf16e2eb788145ab01b78d3c3cb682205a | |
| parent | Create the sys/syscall.ph header file on demand for the sendsyslog(2) (diff) | |
| download | wireguard-openbsd-d5a6057654c160cf2a98cd20a3313660fcfba1ef.tar.xz wireguard-openbsd-d5a6057654c160cf2a98cd20a3313660fcfba1ef.zip | |
Kill recursive splsoftnet().
ok phessler@, bluhm@ as part of a larger diff.
| -rw-r--r-- | sys/netinet6/nd6.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 8d87cf7f2c7..3b393652dcf 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.194 2016/11/07 09:19:46 mpi Exp $ */ +/* $OpenBSD: nd6.c,v 1.195 2016/11/15 13:12:24 mpi Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -308,10 +308,6 @@ skip1: void nd6_llinfo_settimer(struct llinfo_nd6 *ln, int secs) { - int s; - - s = splsoftnet(); - if (secs < 0) { ln->ln_rt->rt_expire = 0; timeout_del(&ln->ln_timer_ch); @@ -319,8 +315,6 @@ nd6_llinfo_settimer(struct llinfo_nd6 *ln, int secs) ln->ln_rt->rt_expire = time_uptime + secs; timeout_add_sec(&ln->ln_timer_ch, secs); } - - splx(s); } void |