diff options
| author |   tb <tb@openbsd.org> | 2017-11-14 16:01:55 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2017-11-14 16:01:55 +0000 |
| commit | b232ab76bd3df97b92b69e4800cc2a9ff47f47c9 (patch) | |
| tree | 331da02a9fcb17344ded0070eb850222ef873ff7 /sys/kern/sys_socket.c | |
| parent | Add more checks helping to set up the test environment. (diff) | |
| download | wireguard-openbsd-b232ab76bd3df97b92b69e4800cc2a9ff47f47c9.tar.xz wireguard-openbsd-b232ab76bd3df97b92b69e4800cc2a9ff47f47c9.zip | |
Push the NET_LOCK into ifioctl() and use the NET_RLOCK in ifioctl_get().
In particular, this allows SIOCGIF* requests to run in parallel.
lots of help & ok mpi, ok visa, sashan
Diffstat (limited to 'sys/kern/sys_socket.c')
| -rw-r--r-- | sys/kern/sys_socket.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index e73fc3f5603..4b1b826b349 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_socket.c,v 1.33 2017/08/11 21:24:19 mpi Exp $ */ +/* $OpenBSD: sys_socket.c,v 1.34 2017/11/14 16:01:55 tb Exp $ */ /* $NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $ */ /* @@ -125,9 +125,7 @@ soo_ioctl(struct file *fp, u_long cmd, caddr_t data, struct proc *p) * different entry since a socket's unnecessary */ if (IOCGROUP(cmd) == 'i') { - NET_LOCK(); error = ifioctl(so, cmd, data, p); - NET_UNLOCK(); return (error); } if (IOCGROUP(cmd) == 'r') |