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/ip_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.245.2.5
retrieving revision 1.254.4.2
diff -u -p -r1.245.2.5 -r1.254.4.2
--- src/sys/netinet/ip_input.c	2007/10/09 13:44:50	1.245.2.5
+++ src/sys/netinet/ip_input.c	2007/12/08 18:21:13	1.254.4.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.245.2.5 2007/10/09 13:44:50 ad Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.254.4.2 2007/12/08 18:21:13 mjf Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.245.2.5 2007/10/09 13:44:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.254.4.2 2007/12/08 18:21:13 mjf Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -469,7 +469,6 @@ ipintr(void)
 		splx(s);
 		if (m == 0)
 			return;
-		MCLAIM(m, &ip_rx_mowner);
 		ip_input(m);
 	}
 }
@@ -1777,12 +1776,15 @@ ip_srcroute(void)
 }
 
 const int inetctlerrmap[PRC_NCMDS] = {
-	0,		0,		0,		0,
-	0,		EMSGSIZE,	EHOSTDOWN,	EHOSTUNREACH,
-	EHOSTUNREACH,	EHOSTUNREACH,	ECONNREFUSED,	ECONNREFUSED,
-	EMSGSIZE,	EHOSTUNREACH,	0,		0,
-	0,		0,		0,		0,
-	ENOPROTOOPT
+	[PRC_MSGSIZE] = EMSGSIZE,
+	[PRC_HOSTDEAD] = EHOSTDOWN,
+	[PRC_HOSTUNREACH] = EHOSTUNREACH,
+	[PRC_UNREACH_NET] = EHOSTUNREACH,
+	[PRC_UNREACH_HOST] = EHOSTUNREACH,
+	[PRC_UNREACH_PROTOCOL] = ECONNREFUSED,
+	[PRC_UNREACH_PORT] = ECONNREFUSED,
+	[PRC_UNREACH_SRCFAIL] = EHOSTUNREACH,
+	[PRC_PARAMPROB] = ENOPROTOOPT,
 };
 
 /*