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.132.2.5
retrieving revision 1.140.2.1
diff -u -p -r1.132.2.5 -r1.140.2.1
--- src/sys/kern/uipc_socket.c	2007/05/07 10:55:48	1.132.2.5
+++ src/sys/kern/uipc_socket.c	2007/08/15 13:49:18	1.140.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.132.2.5 2007/05/07 10:55:48 yamt Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.140.2.1 2007/08/15 13:49:18 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.132.2.5 2007/05/07 10:55:48 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.140.2.1 2007/08/15 13:49:18 skrll Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -1403,6 +1403,7 @@ sosetopt(struct socket *so, int level, i
 	int		error;
 	struct mbuf	*m;
 	struct linger	*l;
+	struct sockbuf	*sb;
 
 	error = 0;
 	m = m0;
@@ -1477,12 +1478,13 @@ sosetopt(struct socket *so, int level, i
 
 			case SO_SNDBUF:
 			case SO_RCVBUF:
-				if (sbreserve(optname == SO_SNDBUF ?
-				    &so->so_snd : &so->so_rcv,
-				    (u_long) optval, so) == 0) {
+				sb = (optname == SO_SNDBUF) ?
+				    &so->so_snd : &so->so_rcv;
+				if (sbreserve(sb, (u_long)optval, so) == 0) {
 					error = ENOBUFS;
 					goto bad;
 				}
+				sb->sb_flags &= ~SB_AUTOSIZE;
 				break;
 
 			/*