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.80.2.3
retrieving revision 1.90
diff -u -p -r1.80.2.3 -r1.90
--- src/sys/netinet/udp_usrreq.c	2002/06/23 17:51:04	1.80.2.3
+++ src/sys/netinet/udp_usrreq.c	2001/11/07 06:30:50	1.90
@@ -1,9 +1,9 @@
-/*	$NetBSD: udp_usrreq.c,v 1.80.2.3 2002/06/23 17:51:04 jdolecek Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.90 2001/11/07 06:30:50 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -15,7 +15,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -64,9 +64,6 @@
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.80.2.3 2002/06/23 17:51:04 jdolecek Exp $");
-
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_inet_csum.h"
@@ -139,9 +136,6 @@ int	udpcksum = 1;
 int	udpcksum = 0;		/* XXX */
 #endif
 
-struct	inpcbtable udbtable;
-struct	udpstat udpstat;
-
 #ifdef INET
 static void udp4_sendup __P((struct mbuf *, int, struct sockaddr *,
 	struct socket *));
@@ -633,7 +627,7 @@ udp4_realinput(src, dst, m, off)
 		 */
 
 		/*
-		 * KAME note: traditionally we dropped udpiphdr from mbuf here.
+		 * KAME note: usually we drop udpiphdr from mbuf here.
 		 * we need udpiphdr for IPsec processing so we do that later.
 		 */
 		/*
@@ -739,7 +733,7 @@ udp6_realinput(af, src, dst, m, off)
 		 */
 
 		/*
-		 * KAME note: traditionally we dropped udpiphdr from mbuf here.
+		 * KAME note: usually we drop udpiphdr from mbuf here.
 		 * we need udpiphdr for IPsec processing so we do that later.
 		 */
 		/*
@@ -752,7 +746,8 @@ udp6_realinput(af, src, dst, m, off)
 			if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) {
 				if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, &dst6))
 					continue;
-			} else {
+			}
+			else {
 				if (IN6_IS_ADDR_V4MAPPED(&dst6) &&
 				    (in6p->in6p_flags & IN6P_IPV6_V6ONLY))
 					continue;
@@ -761,7 +756,8 @@ udp6_realinput(af, src, dst, m, off)
 				if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_faddr,
 				    &src6) || in6p->in6p_fport != sport)
 					continue;
-			} else {
+			}
+			else {
 				if (IN6_IS_ADDR_V4MAPPED(&src6) &&
 				    (in6p->in6p_flags & IN6P_IPV6_V6ONLY))
 					continue;
@@ -1137,7 +1133,7 @@ udp_sysctl(name, namelen, oldp, oldlenp,
 		return (sysctl_int(oldp, oldlenp, newp, newlen,
 		    &udp_sendspace));
 	case UDPCTL_RECVSPACE:
-		return (sysctl_int(oldp, oldlenp, newp, newlen,
+		return (sysctl_int(oldp, oldlenp, newp, newlen, 
 		    &udp_recvspace));
 	default:
 		return (ENOPROTOOPT);