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.181
retrieving revision 1.185
diff -u -p -r1.181 -r1.185
--- src/sys/kern/uipc_socket.c	2009/01/14 23:28:23	1.181
+++ src/sys/kern/uipc_socket.c	2009/01/21 06:59:29	1.185
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.181 2009/01/14 23:28:23 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.181 2009/01/14 23:28:23 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"
@@ -95,8 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket.
 
 #ifdef COMPAT_50
 #include <compat/sys/time.h>
-#define	SO_OSNDTIMEO	0x1005
-#define	SO_ORCVTIMEO	0x1006
+#include <compat/sys/socket.h>
 #endif
 
 #include <uvm/uvm.h>
@@ -681,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;
 			}
@@ -1583,7 +1582,7 @@ sorflush(struct socket *so)
 static int
 sosetopt1(struct socket *so, const struct sockopt *sopt)
 {
-	int error = 0, optval, opt;
+	int error = EINVAL, optval, opt;
 	struct linger l;
 	struct timeval tv;
 
@@ -1620,6 +1619,9 @@ sosetopt1(struct socket *so, const struc
 	case SO_REUSEPORT:
 	case SO_OOBINLINE:
 	case SO_TIMESTAMP:
+#ifdef SO_OTIMESTAMP
+	case SO_OTIMESTAMP:
+#endif
 		error = sockopt_getint(sopt, &optval);
 		solock(so);
 		if (error)
@@ -1690,16 +1692,18 @@ sosetopt1(struct socket *so, const struc
 	case SO_ORCVTIMEO: {
 		struct timeval50 otv;
 		error = sockopt_get(sopt, &otv, sizeof(otv));
+		if (error)
+			break;
 		timeval50_to_timeval(&otv, &tv);
 		opt = opt == SO_OSNDTIMEO ? SO_SNDTIMEO : SO_RCVTIMEO;
-		error = 1;
+		error = 0;
 		/*FALLTHROUGH*/
 	}
 #endif /* COMPAT_50 */
 
 	case SO_SNDTIMEO:
 	case SO_RCVTIMEO:
-		if (error == 0)
+		if (error)
 			error = sockopt_get(sopt, &tv, sizeof(tv));
 		solock(so);
 		if (error)
@@ -1813,6 +1817,9 @@ sogetopt1(struct socket *so, struct sock
 	case SO_BROADCAST:
 	case SO_OOBINLINE:
 	case SO_TIMESTAMP:
+#ifdef SO_OTIMESTAMP
+	case SO_OTIMESTAMP:
+#endif
 		error = sockopt_setint(sopt, (so->so_options & opt) ? 1 : 0);
 		break;