aboutsummaryrefslogtreecommitdiff
path: root/sys/netncp
diff options
context:
space:
mode:
authorSeigo Tanimura <tanimura@FreeBSD.org>2002-05-31 11:52:35 +0000
committerSeigo Tanimura <tanimura@FreeBSD.org>2002-05-31 11:52:35 +0000
commit4cc20ab1f0f3d1126126327aa298ab88c974c53d (patch)
tree9d5f24794525313566896ab89aa860515db344a6 /sys/netncp
parentc82593cf2c9a5b4ccd2be043f6c9ccc8af22fcc9 (diff)
Notes
Diffstat (limited to 'sys/netncp')
-rw-r--r--sys/netncp/ncp_sock.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/netncp/ncp_sock.c b/sys/netncp/ncp_sock.c
index 9055d14e34ceb..4a03565b953cc 100644
--- a/sys/netncp/ncp_sock.c
+++ b/sys/netncp/ncp_sock.c
@@ -86,18 +86,15 @@ ncp_soconnect(struct socket *so,struct sockaddr *target, struct proc *p) {
*/
error = EIO;
s = splnet();
- SOCK_LOCK(so);
while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
- (void) msleep((caddr_t)&so->so_timeo, SOCK_MTX(so), PSOCK, "ncpcon", 2 * hz);
+ (void) tsleep((caddr_t)&so->so_timeo, PSOCK, "ncpcon", 2 * hz);
if ((so->so_state & SS_ISCONNECTING) &&
so->so_error == 0 /*&& rep &&*/) {
so->so_state &= ~SS_ISCONNECTING;
- SOCK_UNLOCK(so);
splx(s);
goto bad;
}
}
- SOCK_UNLOCK(so);
if (so->so_error) {
error = so->so_error;
so->so_error = 0;