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.224.4.1
retrieving revision 1.226.2.1
diff -u -p -r1.224.4.1 -r1.226.2.1
--- src/sys/netinet/ip_input.c	2006/04/19 04:46:11	1.224.4.1
+++ src/sys/netinet/ip_input.c	2006/06/19 04:09:48	1.226.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.224.4.1 2006/04/19 04:46:11 elad Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.226.2.1 2006/06/19 04:09:48 chap 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.224.4.1 2006/04/19 04:46:11 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.226.2.1 2006/06/19 04:09:48 chap 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.tv_sec & 0xfffff;
+	ip_id = time_second & 0xfffff;
 
 	ipintrq.ifq_maxlen = ipqmaxlen;
 	ip_nmbclusters_changed();
@@ -974,7 +974,7 @@ found:
 		goto bad;
 	}
 #endif
-#if FAST_IPSEC
+#ifdef FAST_IPSEC
 	/*
 	 * enforce IPsec policy checking if we are seeing last header.
 	 * note that we do not visit this with protocols with pcb layer