[src/trunk]: src/sys/netinet6 previous commit cached pcb policy too much (whe...

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

details:   https://anonhg.NetBSD.org/src/rev/64c66686e26d
branches:  trunk
changeset: 532858:64c66686e26d
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sun Jun 16 16:28:36 2002 +0000

description:
previous commit cached pcb policy too much (when pcb points to
SPD entry that is not ipsec - like "none").  back it out.  sync w/kame

diffstat:

 sys/netinet6/ipsec.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 100ae61b89da -r 64c66686e26d sys/netinet6/ipsec.c
--- a/sys/netinet6/ipsec.c      Sun Jun 16 16:00:31 2002 +0000
+++ b/sys/netinet6/ipsec.c      Sun Jun 16 16:28:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.c,v 1.57 2002/06/14 14:47:24 itojun Exp $        */
+/*     $NetBSD: ipsec.c,v 1.58 2002/06/16 16:28:36 itojun Exp $        */
 /*     $KAME: ipsec.c,v 1.136 2002/05/19 00:36:39 itojun Exp $ */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.57 2002/06/14 14:47:24 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.58 2002/06/16 16:28:36 itojun Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -202,8 +202,7 @@
                if (ipsec_setspidx(m, &spidx, 1) != 0)
                        return NULL;
                if (bcmp(&pcbsp->cacheidx[dir], &spidx, sizeof(spidx))) {
-                       if (pcbsp->cache[dir]->policy == IPSEC_POLICY_IPSEC &&
-                           pcbsp->cache[dir]->spidx &&
+                       if (pcbsp->cache[dir]->spidx &&
                            !key_cmpspidx_withmask(pcbsp->cache[dir]->spidx,
                            &spidx))
                                return NULL;