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.169.2.6
retrieving revision 1.218
diff -u -p -r1.169.2.6 -r1.218
--- src/sys/netinet/ip_input.c	2005/03/04 16:53:29	1.169.2.6
+++ src/sys/netinet/ip_input.c	2005/06/28 19:38:58	1.218
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.169.2.6 2005/03/04 16:53:29 skrll Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.218 2005/06/28 19:38:58 seanb 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.169.2.6 2005/03/04 16:53:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.218 2005/06/28 19:38:58 seanb Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -131,6 +131,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_input.c,v
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
+#include <netinet/in_proto.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
@@ -200,7 +201,6 @@ int	ipprintfs = 0;
 #endif
 
 int	ip_do_randomid = 0;
-int	ip_do_loopback_cksum = 0;
 
 /*
  * XXX - Setting ip_checkinterface mostly implements the receive side of
@@ -1226,6 +1226,7 @@ insert:
 		for (t = m; t; t = t->m_next)
 			plen += t->m_len;
 		m->m_pkthdr.len = plen;
+		m->m_pkthdr.csum_flags = 0;
 	}
 	return (m);
 
@@ -1871,7 +1872,7 @@ ip_forward(struct mbuf *m, int srcrt)
 
 		rtalloc(&ipforward_rt);
 		if (ipforward_rt.ro_rt == 0) {
-			icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, dest, 0);
+			icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_NET, dest, 0);
 			return;
 		}
 		rt = ipforward_rt.ro_rt;