diff options
| -rw-r--r-- | sys/kern/uipc_socket.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index f578dcd..3c1adf8 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -106,7 +106,6 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, numopensockets, CTLFLAG_RD, /* * Get a socket structure from our zone, and initialize it. - * We don't implement `waitok' yet (see comments in uipc_domain.c). * Note that it would probably be better to allocate socket * and PCB at the same time, but I'm not convinced that all * the protocols can be easily modified to do this. @@ -118,8 +117,14 @@ soalloc(waitok) int waitok; { struct socket *so; + int flag; - so = uma_zalloc(socket_zone, waitok); + if (waitok == 1) + flag = M_WAITOK; + else + flag = M_NOWAIT; + + so = uma_zalloc(socket_zone, flag); if (so) { /* XXX race condition for reentrant kernel */ bzero(so, sizeof *so); |
