[src/netbsd-1-5]: src/sys/netinet6 Pull up revision 1.25 (requested by itojun):

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

details:   https://anonhg.NetBSD.org/src/rev/3a9afe57a59b
branches:  netbsd-1-5
changeset: 491208:3a9afe57a59b
user:      he <he%NetBSD.org@localhost>
date:      Fri Apr 06 00:29:03 2001 +0000

description:
Pull up revision 1.25 (requested by itojun):
  Record IPsec packet history in m_aux structure.  Let ipfilter
  look at wire-format packet only (not the decapsulated ones), so
  that VPN setting can work with NAT/ipfilter settings.

diffstat:

 sys/netinet6/nd6_nbr.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 0b7fad596e96 -r 3a9afe57a59b sys/netinet6/nd6_nbr.c
--- a/sys/netinet6/nd6_nbr.c    Fri Apr 06 00:28:47 2001 +0000
+++ b/sys/netinet6/nd6_nbr.c    Fri Apr 06 00:29:03 2001 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: nd6_nbr.c,v 1.22 2000/05/19 01:40:19 itojun Exp $      */
-/*     $KAME: nd6_nbr.c,v 1.36 2000/05/17 12:35:59 jinmei Exp $        */
+/*     $NetBSD: nd6_nbr.c,v 1.22.4.1 2001/04/06 00:29:03 he Exp $      */
+/*     $KAME: nd6_nbr.c,v 1.51 2001/01/20 17:27:00 itojun Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -493,7 +493,7 @@
 
 #ifdef IPSEC
        /* Don't lookup socket */
-       ipsec_setsocket(m, NULL);
+       (void)ipsec_setsocket(m, NULL);
 #endif
        ip6_output(m, NULL, NULL, dad ? IPV6_DADOUTPUT : 0, &im6o, &outif);
        if (outif) {
@@ -913,7 +913,7 @@
 
 #ifdef IPSEC
        /* Don't lookup socket */
-       ipsec_setsocket(m, NULL);
+       (void)ipsec_setsocket(m, NULL);
 #endif
        ip6_output(m, NULL, NULL, 0, &im6o, &outif);
        if (outif) {