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.223.6.3
retrieving revision 1.224
diff -u -p -r1.223.6.3 -r1.224
--- src/sys/netinet/ip_input.c	2006/06/01 22:38:47	1.223.6.3
+++ src/sys/netinet/ip_input.c	2006/02/18 17:47:07	1.224
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.223.6.3 2006/06/01 22:38:47 kardel Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.224 2006/02/18 17:47:07 joerg 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.223.6.3 2006/06/01 22:38:47 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.224 2006/02/18 17:47:07 joerg Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -414,7 +414,7 @@ ip_init(void)
 	for (i = 0; i < IPREASS_NHASH; i++)
 	    	LIST_INIT(&ipq[i]);
 
-	ip_id = time_second & 0xfffff;
+	ip_id = time.tv_sec & 0xfffff;
 
 	ipintrq.ifq_maxlen = ipqmaxlen;
 	ip_nmbclusters_changed();
@@ -732,7 +732,7 @@ ip_input(struct mbuf *m)
 	}
 	if (ia != NULL)
 		goto ours;
-	if (m->m_pkthdr.rcvif && m->m_pkthdr.rcvif->if_flags & IFF_BROADCAST) {
+	if (m->m_pkthdr.rcvif->if_flags & IFF_BROADCAST) {
 		IFADDR_FOREACH(ifa, m->m_pkthdr.rcvif) {
 			if (ifa->ifa_addr->sa_family != AF_INET)
 				continue;
@@ -974,7 +974,7 @@ found:
 		goto bad;
 	}
 #endif
-#ifdef FAST_IPSEC
+#if FAST_IPSEC
 	/*
 	 * enforce IPsec policy checking if we are seeing last header.
 	 * note that we do not visit this with protocols with pcb layer