summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2015-01-14 00:37:20 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2015-01-14 00:37:20 +0000
commit5d815c0202b1fac011f717f699ecc521a897efb4 (patch)
tree96213db53374e63337379332d2c231b6cceb692f /sys/net
parent3941772e9026c60c433c251dfbad934ad6e81d3f (diff)
It is sufficient to protect in6_ifattach() with splsoftnet().
OK mpi@
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index 28f73adb58a..38710e7d8e5 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.311 2015/01/10 11:43:37 mpi Exp $ */
+/* $OpenBSD: if.c,v 1.312 2015/01/14 00:37:19 bluhm Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -1307,7 +1307,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p)
#ifdef INET6
if (ISSET(ifr->ifr_flags, IFXF_AUTOCONF6)) {
if (in6ifa_ifpforlinklocal(ifp, 0) == NULL) {
- s = splnet();
+ s = splsoftnet();
in6_ifattach(ifp);
splx(s);
}