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.73.2.1.2.2 retrieving revision 1.74 diff -u -p -r1.73.2.1.2.2 -r1.74 --- src/sys/netinet6/ip6_input.c 2006/05/28 13:44:04 1.73.2.1.2.2 +++ src/sys/netinet6/ip6_input.c 2004/05/25 04:34:00 1.74 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.73.2.1.2.2 2006/05/28 13:44:04 riz Exp $ */ +/* $NetBSD: ip6_input.c,v 1.74 2004/05/25 04:34:00 atatat Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.73.2.1.2.2 2006/05/28 13:44:04 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.74 2004/05/25 04:34:00 atatat Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -1015,11 +1015,6 @@ ip6_savecontrol(in6p, mp, ip6, m) 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) - return; - if (in6p->in6p_flags & IN6P_RECVDSTADDR) { *mp = sbcreatecontrol((caddr_t) &ip6->ip6_dst, sizeof(struct in6_addr), IPV6_RECVDSTADDR, IPPROTO_IPV6);