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.116.2.4
retrieving revision 1.117
diff -u -p -r1.116.2.4 -r1.117
--- src/sys/netinet/udp_usrreq.c	2004/05/28 07:24:17	1.116.2.4
+++ src/sys/netinet/udp_usrreq.c	2004/03/31 07:54:00	1.117
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.116.2.4 2004/05/28 07:24:17 tron Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.117 2004/03/31 07:54:00 itojun 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.116.2.4 2004/05/28 07:24:17 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.117 2004/03/31 07:54:00 itojun 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
@@ -434,8 +433,7 @@ udp6_input(mp, offp, proto)
 	if (uh->uh_sum == 0) {
 		udp6stat.udp6s_nosum++;
 		goto bad;
-	}
-	if (in6_cksum(m, IPPROTO_UDP, off, ulen) != 0) {
+	} else if (in6_cksum(m, IPPROTO_UDP, off, ulen) != 0) {
 		udp6stat.udp6s_badsum++;
 		goto bad;
 	}
@@ -1127,29 +1125,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 and check 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);