diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2016-10-09 19:33:35 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2016-10-09 19:33:35 +0000 |
| commit | e9773d4372e6a407c0abe57cb2db83b612902102 (patch) | |
| tree | 556cc8162c830e6e0ada9dcd5ead8b422a518566 | |
| parent | 0f1a19bbae4bea2f16351d3decc42948136a5c43 (diff) | |
sowakeup() is only called from sorwakeup() and sowwakeup(). Both
have an splsoftassert(IPL_SOFTNET) now, so sowakeup() does not need
to call splsoftnet() anymore.
From mpi@'s netlock diff; OK mikeb@
| -rw-r--r-- | sys/kern/uipc_socket2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index c08e5955fa5..c3b7c3ae280 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket2.c,v 1.66 2016/10/06 19:09:08 bluhm Exp $ */ +/* $OpenBSD: uipc_socket2.c,v 1.67 2016/10/09 19:33:34 bluhm Exp $ */ /* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */ /* @@ -315,7 +315,7 @@ sbunlock(struct sockbuf *sb) void sowakeup(struct socket *so, struct sockbuf *sb) { - int s = splsoftnet(); + splsoftassert(IPL_SOFTNET); selwakeup(&sb->sb_sel); sb->sb_flagsintr &= ~SB_SEL; @@ -323,7 +323,6 @@ sowakeup(struct socket *so, struct sockbuf *sb) sb->sb_flagsintr &= ~SB_WAIT; wakeup(&sb->sb_cc); } - splx(s); if (so->so_state & SS_ASYNC) csignal(so->so_pgid, SIGIO, so->so_siguid, so->so_sigeuid); } |