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.146
retrieving revision 1.148
diff -u -p -r1.146 -r1.148
--- src/sys/kern/uipc_socket.c	2007/11/24 07:46:11	1.146
+++ src/sys/kern/uipc_socket.c	2007/12/05 07:06:55	1.148
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.146 2007/11/24 07:46:11 dyoung Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.148 2007/12/05 07:06:55 ad 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.146 2007/11/24 07:46:11 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.148 2007/12/05 07:06:55 ad Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -428,11 +428,11 @@ sokva_reclaim_callback(struct callback_e
 }
 
 struct mbuf *
-getsombuf(struct socket *so)
+getsombuf(struct socket *so, int type)
 {
 	struct mbuf *m;
 
-	m = m_get(M_WAIT, MT_SONAME);
+	m = m_get(M_WAIT, type);
 	MCLAIM(m, so->so_mowner);
 	return m;
 }
@@ -442,7 +442,7 @@ m_intopt(struct socket *so, int val)
 {
 	struct mbuf *m;
 
-	m = getsombuf(so);
+	m = getsombuf(so, MT_SOOPTS);
 	m->m_len = sizeof(int);
 	*mtod(m, int *) = val;
 	return m;
@@ -452,7 +452,7 @@ void
 soinit(void)
 {
 
-	mutex_init(&so_pendfree_lock, MUTEX_DRIVER, IPL_VM);
+	mutex_init(&so_pendfree_lock, MUTEX_DEFAULT, IPL_VM);
 	cv_init(&socurkva_cv, "sokva");
 
 	/* Set the initial adjusted socket buffer size. */