diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-10-06 17:02:10 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-10-06 17:02:10 +0000 |
| commit | 7dc2a26873a1a1c590cda703ec43c0684f012ae6 (patch) | |
| tree | 29e8d7aca34434878f0c5afabe0abbf4c5abe771 /sys/kern/sys_socket.c | |
| parent | Remove _ds_boundary abuse (again) (diff) | |
| download | wireguard-openbsd-7dc2a26873a1a1c590cda703ec43c0684f012ae6.tar.xz wireguard-openbsd-7dc2a26873a1a1c590cda703ec43c0684f012ae6.zip | |
Separate splsoftnet() from variable initialization.
From mpi@'s netlock diff; OK mikeb@
Diffstat (limited to 'sys/kern/sys_socket.c')
| -rw-r--r-- | sys/kern/sys_socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 20e2fa1318b..7a90f780067 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_socket.c,v 1.21 2015/12/05 10:11:53 tedu Exp $ */ +/* $OpenBSD: sys_socket.c,v 1.22 2016/10/06 17:02:10 bluhm Exp $ */ /* $NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $ */ /* @@ -131,8 +131,9 @@ soo_poll(struct file *fp, int events, struct proc *p) { struct socket *so = fp->f_data; int revents = 0; - int s = splsoftnet(); + int s; + s = splsoftnet(); if (events & (POLLIN | POLLRDNORM)) { if (soreadable(so)) revents |= events & (POLLIN | POLLRDNORM); |