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/netinet6/ip6_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.113.12.3
retrieving revision 1.124
diff -u -p -r1.113.12.3 -r1.124
--- src/sys/netinet6/ip6_input.c	2008/09/28 10:40:59	1.113.12.3
+++ src/sys/netinet6/ip6_input.c	2009/03/18 16:00:23	1.124
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.113.12.3 2008/09/28 10:40:59 mjf Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.124 2009/03/18 16:00:23 cegger Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -62,12 +62,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.113.12.3 2008/09/28 10:40:59 mjf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.124 2009/03/18 16:00:23 cegger Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #include "opt_pfil_hooks.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -120,6 +121,11 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c,
 #include <netipsec/key.h>
 #endif /* FAST_IPSEC */
 
+#ifdef COMPAT_50
+#include <compat/sys/time.h>
+#include <compat/sys/socket.h>
+#endif
+
 #include <netinet6/ip6protosw.h>
 
 #include "faith.h"
@@ -1102,17 +1108,27 @@ ip6_savecontrol(struct in6pcb *in6p, str
 #define IS2292(x, y)	(y)
 #endif
 
-#ifdef SO_TIMESTAMP
-	if (in6p->in6p_socket->so_options & SO_TIMESTAMP) {
+	if (in6p->in6p_socket->so_options & SO_TIMESTAMP
+#ifdef SO_OTIMESTAMP
+	    || in6p->in6p_socket->so_options & SO_OTIMESTAMP
+#endif
+	) {
 		struct timeval tv;
 
 		microtime(&tv);
+#ifdef SO_OTIMESTAMP
+		if (in6p->in6p_socket->so_options & SO_OTIMESTAMP) {
+			struct timeval50 tv50;
+			timeval_to_timeval50(&tv, &tv50);
+			*mp = sbcreatecontrol((void *) &tv50, sizeof(tv50),
+			    SCM_OTIMESTAMP, SOL_SOCKET);
+		} else
+#endif
 		*mp = sbcreatecontrol((void *) &tv, sizeof(tv),
 		    SCM_TIMESTAMP, SOL_SOCKET);
 		if (*mp)
 			mp = &(*mp)->m_next;
 	}
-#endif
 
 	/* some OSes call this logic with IPv4 packet, for SO_TIMESTAMP */
 	if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION)
@@ -1562,7 +1578,7 @@ ip6_addaux(struct mbuf *m)
 		    M_NOWAIT);
 		if (mtag) {
 			m_tag_prepend(m, mtag);
-			bzero(mtag + 1, sizeof(struct ip6aux));
+			memset(mtag + 1, 0, sizeof(struct ip6aux));
 		}
 	}
 	return mtag;