summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-03-04 22:40:17 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-03-04 22:40:17 +0000
commitb751ff7496fc73fe22ed7d0c2371837c4c2aed2c (patch)
treebd1ae2cb58e37d25f97c0e7f581ad0b9035bf683 /sys/kern
parent15e7a983128283f9a61840e1ed37255bb4ada6fe (diff)
With the exception of two other small uncommited diffs this moves
the remainder of the network stack from splimp to splnet. ok miod@
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/init_main.c4
-rw-r--r--sys/kern/uipc_socket.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index ac9dac3a46b..573791b6eed 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.128 2006/01/01 11:54:31 miod Exp $ */
+/* $OpenBSD: init_main.c,v 1.129 2006/03/04 22:40:15 brad Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -380,7 +380,7 @@ main(void *framep)
* Initialize protocols. Block reception of incoming packets
* until everything is ready.
*/
- s = splimp();
+ s = splnet();
ifinit();
domaininit();
if_attachdomain();
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 6b0a5d685c9..64848625731 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_socket.c,v 1.62 2006/01/05 05:05:06 jsg Exp $ */
+/* $OpenBSD: uipc_socket.c,v 1.63 2006/03/04 22:40:15 brad Exp $ */
/* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */
/*
@@ -951,7 +951,7 @@ sorflush(struct socket *so)
sb->sb_flags |= SB_NOINTR;
(void) sblock(sb, M_WAITOK);
- s = splimp();
+ s = splnet();
socantrcvmore(so);
sbunlock(sb);
asb = *sb;