summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2017-02-01 01:25:20 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2017-02-01 01:25:20 +0000
commit00bbe5e4dae6ad3ba6ec29ff18cf4f4401b0b1dc (patch)
tree485dba9058b8a5d931268401cedc2749889f78eb /sys
parent93198dac9b7a10a19aaee129b52ff614d769bdff (diff)
Switch from splsoftnet to taking the netlock in if_attachhead().
The same change was made to if_attach() in rev 1.467. ok mpi@
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index 0dd6e9aac17..5d11b721071 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.483 2017/01/31 12:16:20 mpi Exp $ */
+/* $OpenBSD: if.c,v 1.484 2017/02/01 01:25:19 jsg Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -513,11 +513,11 @@ if_attachhead(struct ifnet *ifp)
{
int s;
- s = splsoftnet();
+ NET_LOCK(s);
if_attach_common(ifp);
TAILQ_INSERT_HEAD(&ifnet, ifp, if_list);
if_attachsetup(ifp);
- splx(s);
+ NET_UNLOCK(s);
}
void