[src/netbsd-2-1]: src/sys/netinet6 Pull up following revision(s) (requested b...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2cecf1455272
branches:  netbsd-2-1
changeset: 564189:2cecf1455272
user:      riz <riz%NetBSD.org@localhost>
date:      Wed May 24 02:37:19 2006 +0000

description:
Pull up following revision(s) (requested by rpaulo in ticket #10626):
        sys/netinet6/ip6_input.c: revision 1.87
In ip6_savecontrol(), ignore IPv4 packets.
>From JINMEI Tatuya (KAME). Should fix PR 33269.

diffstat:

 sys/netinet6/ip6_input.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 62992ea8d758 -r 2cecf1455272 sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Wed May 24 02:29:11 2006 +0000
+++ b/sys/netinet6/ip6_input.c  Wed May 24 02:37:19 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_input.c,v 1.73.2.1 2004/05/28 07:23:48 tron Exp $  */
+/*     $NetBSD: ip6_input.c,v 1.73.2.1.4.1 2006/05/24 02:37:19 riz Exp $       */
 /*     $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $     */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.73.2.1 2004/05/28 07:23:48 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.73.2.1.4.1 2006/05/24 02:37:19 riz Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1015,6 +1015,11 @@
                        mp = &(*mp)->m_next;
        }
 #endif
+
+       /* some OSes call this logic with IPv4 packet, for SO_TIMESTAMP */
+       if ((ip6->ip6_vfc & IPV6_VERSION_MASK) !=3D IPV6_VERSION)
+               return;
+
        if (in6p->in6p_flags & IN6P_RECVDSTADDR) {
                *mp = sbcreatecontrol((caddr_t) &ip6->ip6_dst,
                    sizeof(struct in6_addr), IPV6_RECVDSTADDR, IPPROTO_IPV6);