From 1d7ed57b00b8b251009973c4b8d97ac47d901a5f Mon Sep 17 00:00:00 2001
From: bluhm <bluhm@openbsd.org>
Date: Wed, 14 Jan 2015 00:37:19 +0000
Subject: [PATCH] It is sufficient to protect in6_ifattach() with splsoftnet().
 OK mpi@

---
 sys/net/if.c | 4 ++--
 1 file 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);
 			}
-- 
2.20.1