diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-11-04 11:33:00 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-11-04 15:28:21 +0100 |
| commit | af5333e0a02b2295304d4e029b15ee15a4fe2b3a (patch) | |
| tree | c5c43680d374f58b487eeeaf18fb7ec6b84ba074 /freebsd/sys/kern/sys_socket.c | |
| parent | BUS_SPACE(9): Use simple memory model for ARM (diff) | |
| download | rtems-libbsd-af5333e0a02b2295304d4e029b15ee15a4fe2b3a.tar.bz2 | |
Update to FreeBSD 8.4
Diffstat (limited to 'freebsd/sys/kern/sys_socket.c')
| -rw-r--r-- | freebsd/sys/kern/sys_socket.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/freebsd/sys/kern/sys_socket.c b/freebsd/sys/kern/sys_socket.c index 6bb4416e..e86698fa 100644 --- a/freebsd/sys/kern/sys_socket.c +++ b/freebsd/sys/kern/sys_socket.c @@ -87,9 +87,7 @@ soo_read(struct file *fp, struct uio *uio, struct ucred *active_cred, if (error) return (error); #endif - CURVNET_SET(so->so_vnet); error = soreceive(so, 0, uio, 0, 0, 0); - CURVNET_RESTORE(); return (error); } #ifdef __rtems__ @@ -210,7 +208,6 @@ soo_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, struct socket *so = fp->f_data; int error = 0; - CURVNET_SET(so->so_vnet); switch (cmd) { case FIONBIO: SOCK_LOCK(so); @@ -297,14 +294,18 @@ soo_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, */ if (IOCGROUP(cmd) == 'i') error = ifioctl(so, cmd, data, td); - else if (IOCGROUP(cmd) == 'r') + else if (IOCGROUP(cmd) == 'r') { + CURVNET_SET(so->so_vnet); error = rtioctl_fib(cmd, data, so->so_fibnum); - else + CURVNET_RESTORE(); + } else { + CURVNET_SET(so->so_vnet); error = ((*so->so_proto->pr_usrreqs->pru_control) (so, cmd, data, 0, td)); + CURVNET_RESTORE(); + } break; } - CURVNET_RESTORE(); return (error); } #ifdef __rtems__ |