diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1999-04-24 18:22:34 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1999-04-24 18:22:34 +0000 |
| commit | 02a3d5261de9e42818b85240b0168e45e3f9dd57 (patch) | |
| tree | 529429d061254cbebd90af005cad37af9fdaceca | |
| parent | fdbad643d59e33e1f89c96bba1c48adc5ce3b86b (diff) | |
Notes
| -rw-r--r-- | sys/kern/uipc_socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index ebfe28222625..f9737037c938 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $Id: uipc_socket.c,v 1.54 1999/02/02 07:23:28 fenner Exp $ + * $Id: uipc_socket.c,v 1.55 1999/02/16 10:49:49 dfr Exp $ */ #include <sys/param.h> @@ -258,7 +258,7 @@ soclose(so) goto drop; while (so->so_state & SS_ISCONNECTED) { error = tsleep((caddr_t)&so->so_timeo, - PSOCK | PCATCH, "soclos", so->so_linger); + PSOCK | PCATCH, "soclos", so->so_linger * hz); if (error) break; } @@ -1049,7 +1049,7 @@ sosetopt(so, sopt) if (error) goto bad; - if (tv.tv_sec > SHRT_MAX / hz - hz) { + if (tv.tv_sec * hz + tv.tv_usec / tick > SHRT_MAX) { error = EDOM; goto bad; } |