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.75 retrieving revision 1.77 diff -u -p -r1.75 -r1.77 --- src/sys/kern/uipc_socket.c 2002/11/27 04:07:42 1.75 +++ src/sys/kern/uipc_socket.c 2003/02/01 06:23:44 1.77 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.75 2002/11/27 04:07:42 itojun Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.77 2003/02/01 06:23:44 thorpej Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.75 2002/11/27 04:07:42 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.77 2003/02/01 06:23:44 thorpej Exp $"); #include "opt_sock_counters.h" #include "opt_sosend_loan.h" @@ -97,6 +97,9 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket. struct pool socket_pool; +MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options"); +MALLOC_DEFINE(M_SONAME, "soname", "socket name"); + extern int somaxconn; /* patchable (XXX sysctl) */ int somaxconn = SOMAXCONN; @@ -151,7 +154,7 @@ int sokvawaiters; #define SOCK_LOAN_CHUNK 65536 static void -sodoloanfree(caddr_t buf, u_int size) +sodoloanfree(caddr_t buf, size_t size) { struct vm_page **pgs; vaddr_t va, sva, eva; @@ -221,7 +224,7 @@ sodopendfree(struct socket *so) } static void -soloanfree(struct mbuf *m, caddr_t buf, u_int size, void *arg) +soloanfree(struct mbuf *m, caddr_t buf, size_t size, void *arg) { struct socket *so = arg; int s;