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
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.177.2.2
retrieving revision 1.184
diff -u -p -r1.177.2.2 -r1.184
--- src/sys/kern/uipc_socket.c	2009/03/03 18:32:57	1.177.2.2
+++ src/sys/kern/uipc_socket.c	2009/01/19 02:27:57	1.184
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.177.2.2 2009/03/03 18:32:57 skrll Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.184 2009/01/19 02:27:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.177.2.2 2009/03/03 18:32:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.184 2009/01/19 02:27:57 christos 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, true, so->so_linger * hz);
+				error = sowait(so, so->so_linger * hz);
 				if (error)
 					break;
 			}
@@ -1692,10 +1692,8 @@ sosetopt1(struct socket *so, const struc
 	case SO_ORCVTIMEO: {
 		struct timeval50 otv;
 		error = sockopt_get(sopt, &otv, sizeof(otv));
-		if (error) {
-			solock(so);
+		if (error)
 			break;
-		}
 		timeval50_to_timeval(&otv, &tv);
 		opt = opt == SO_OSNDTIMEO ? SO_SNDTIMEO : SO_RCVTIMEO;
 		error = 0;