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.119
retrieving revision 1.122
diff -u -p -r1.119 -r1.122
--- src/sys/netinet/udp_usrreq.c	2004/04/18 23:35:56	1.119
+++ src/sys/netinet/udp_usrreq.c	2004/05/25 04:34:00	1.122
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.119 2004/04/18 23:35:56 matt Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.122 2004/05/25 04:34:00 atatat 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.119 2004/04/18 23:35:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.122 2004/05/25 04:34:00 atatat Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -117,6 +117,7 @@ __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
@@ -185,6 +186,11 @@ struct evcnt udp_swcsum = EVCNT_INITIALI
 
 #define	UDP_CSUM_COUNTER_INCR(ev)	(ev)->ev_count++
 
+EVCNT_ATTACH_STATIC(udp_hwcsum_bad);
+EVCNT_ATTACH_STATIC(udp_hwcsum_ok);
+EVCNT_ATTACH_STATIC(udp_hwcsum_data);
+EVCNT_ATTACH_STATIC(udp_swcsum);
+
 #else
 
 #define	UDP_CSUM_COUNTER_INCR(ev)	/* nothing */
@@ -197,13 +203,6 @@ udp_init(void)
 
 	in_pcbinit(&udbtable, udbhashsize, udbhashsize);
 
-#ifdef UDP_CSUM_COUNTERS
-	evcnt_attach_static(&udp_hwcsum_bad);
-	evcnt_attach_static(&udp_hwcsum_ok);
-	evcnt_attach_static(&udp_hwcsum_data);
-	evcnt_attach_static(&udp_swcsum);
-#endif /* UDP_CSUM_COUNTERS */
-
 	MOWNER_ATTACH(&udp_tx_mowner);
 	MOWNER_ATTACH(&udp_rx_mowner);
 	MOWNER_ATTACH(&udp_mowner);
@@ -1090,25 +1089,29 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, 
 		       CTL_NET, PF_INET, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
-		       CTLTYPE_NODE, "udp", NULL,
+		       CTLTYPE_NODE, "udp",
+		       SYSCTL_DESCR("UDPv4 related settings"),
 		       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", NULL,
+		       CTLTYPE_INT, "checksum",
+		       SYSCTL_DESCR("Compute and check UDP checksums"),
 		       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", NULL,
+		       CTLTYPE_INT, "sendspace",
+		       SYSCTL_DESCR("Default UDP send buffer size"),
 		       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", NULL,
+		       CTLTYPE_INT, "recvspace",
+		       SYSCTL_DESCR("Default UDP receive buffer size"),
 		       NULL, 0, &udp_recvspace, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_RECVSPACE,
 		       CTL_EOL);