[src/netbsd-1-5]: src/sys/netinet6 pullup 1.6 -> 1.7 (approved by releng-1-5)

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

details:   https://anonhg.NetBSD.org/src/rev/ec8417ba1028
branches:  netbsd-1-5
changeset: 489565:ec8417ba1028
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Sep 28 19:57:54 2000 +0000

description:
pullup 1.6 -> 1.7 (approved by releng-1-5)
>repair cut-and-paste bug.  from: francis dupont.  sync with kame

diffstat:

 sys/netinet6/route6.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 482f87c91c99 -r ec8417ba1028 sys/netinet6/route6.c
--- a/sys/netinet6/route6.c     Thu Sep 28 19:04:32 2000 +0000
+++ b/sys/netinet6/route6.c     Thu Sep 28 19:57:54 2000 +0000
@@ -1,9 +1,10 @@
-/*     $NetBSD: route6.c,v 1.6 2000/02/06 12:49:49 itojun Exp $        */
+/*     $NetBSD: route6.c,v 1.6.4.1 2000/09/28 19:57:54 itojun Exp $    */
+/*     $KAME: route6.c,v 1.21 2000/09/20 23:00:49 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -15,7 +16,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -157,7 +158,7 @@
        if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst) ||
            IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_dst) ||
            IN6_IS_ADDR_V4MAPPED(&ip6->ip6_dst) ||
-           IN6_IS_ADDR_V4COMPAT(nextaddr)) {
+           IN6_IS_ADDR_V4COMPAT(&ip6->ip6_dst)) {
                ip6stat.ip6s_badoptions++;
                m_freem(m);
                return(-1);
@@ -182,6 +183,6 @@
 #else
        ip6_forward(m, 1);
 #endif
-    
+
        return(-1);                     /* m would be freed in ip6_forward() */
 }