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/netinet/udp_usrreq.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.103.2.2
retrieving revision 1.120
diff -u -p -r1.103.2.2 -r1.120
--- src/sys/netinet/udp_usrreq.c	2004/08/03 10:54:46	1.103.2.2
+++ src/sys/netinet/udp_usrreq.c	2004/05/01 02:20:43	1.120
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.103.2.2 2004/08/03 10:54:46 skrll Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.120 2004/05/01 02:20:43 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.103.2.2 2004/08/03 10:54:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.120 2004/05/01 02:20:43 matt Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -117,7 +117,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 
 #ifdef FAST_IPSEC
 #include <netipsec/ipsec.h>
-#include <netipsec/ipsec_var.h>			/* XXX ipsecstat namespace */
 #ifdef INET6
 #include <netipsec/ipsec6.h>
 #endif
@@ -904,14 +903,12 @@ int	udp_recvspace = 40 * (1024 + sizeof(
 /*ARGSUSED*/
 int
 udp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
-	struct mbuf *control, struct lwp *l)
+	struct mbuf *control, struct proc *p)
 {
 	struct inpcb *inp;
-	struct proc *p;
 	int s;
 	int error = 0;
 
-	p = l ? l->l_proc : NULL;
 	if (req == PRU_CONTROL)
 		return (in_control(so, (long)m, (caddr_t)nam,
 		    (struct ifnet *)control, p));
@@ -1091,29 +1088,25 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, 
 		       CTL_NET, PF_INET, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
-		       CTLTYPE_NODE, "udp",
-		       SYSCTL_DESCR("UDPv4 related settings"),
+		       CTLTYPE_NODE, "udp", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, CTL_EOL);
 
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
-		       CTLTYPE_INT, "checksum",
-		       SYSCTL_DESCR("Compute UDP checksums"),
+		       CTLTYPE_INT, "checksum", NULL,
 		       NULL, 0, &udpcksum, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_CHECKSUM,
 		       CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
-		       CTLTYPE_INT, "sendspace",
-		       SYSCTL_DESCR("Default UDP send buffer size"),
+		       CTLTYPE_INT, "sendspace", NULL,
 		       NULL, 0, &udp_sendspace, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_SENDSPACE,
 		       CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
-		       CTLTYPE_INT, "recvspace",
-		       SYSCTL_DESCR("Default UDP receive buffer size"),
+		       CTLTYPE_INT, "recvspace", NULL,
 		       NULL, 0, &udp_recvspace, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_RECVSPACE,
 		       CTL_EOL);