Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v retrieving revision 1.184 retrieving revision 1.185 diff -u -p -r1.184 -r1.185 --- src/sys/kern/uipc_socket.c 2009/01/19 02:27:57 1.184 +++ src/sys/kern/uipc_socket.c 2009/01/21 06:59:29 1.185 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.184 2009/01/19 02:27:57 christos Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.185 2009/01/21 06:59:29 yamt Exp $ */ /*- * Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.184 2009/01/19 02:27:57 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.185 2009/01/21 06:59:29 yamt Exp $"); #include "opt_compat_netbsd.h" #include "opt_sock_counters.h" @@ -680,7 +680,7 @@ soclose(struct socket *so) if ((so->so_state & SS_ISDISCONNECTING) && so->so_nbio) goto drop; while (so->so_state & SS_ISCONNECTED) { - error = sowait(so, so->so_linger * hz); + error = sowait(so, true, so->so_linger * hz); if (error) break; }