[src/netbsd-1-6]: src/sys/netinet6 Ticket #22, pullup revision 1.48 (itojun)....

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

details:   https://anonhg.NetBSD.org/src/rev/d89d9f6b7dac
branches:  netbsd-1-6
changeset: 527610:d89d9f6b7dac
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed May 29 20:45:05 2002 +0000

description:
Ticket #22, pullup revision 1.48 (itojun).  Original commit message:

> re-enable ipsec policy caching onto pcb.  refcnt fix and workarounds
> based on ymmt-san.

diffstat:

 sys/netinet6/ipsec.c |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (54 lines):

diff -r a402b167363a -r d89d9f6b7dac sys/netinet6/ipsec.c
--- a/sys/netinet6/ipsec.c      Wed May 29 18:01:22 2002 +0000
+++ b/sys/netinet6/ipsec.c      Wed May 29 20:45:05 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.c,v 1.47 2002/05/19 00:46:40 itojun Exp $        */
+/*     $NetBSD: ipsec.c,v 1.47.2.1 2002/05/29 20:45:05 thorpej 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.47 2002/05/19 00:46:40 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.47.2.1 2002/05/29 20:45:05 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -172,9 +172,6 @@
        struct inpcbpolicy *pcbsp;
        int dir;
 {
-#ifndef IPSEC_PCBCACHE
-       return NULL;
-#else
        struct secpolicyindex spidx;
 
        switch (dir) {
@@ -229,7 +226,6 @@
                printf("DP ipsec_checkpcbcache cause refcnt++:%d SP:%p\n",
                pcbsp->cache[dir]->refcnt, pcbsp->cache[dir]));
        return pcbsp->cache[dir];
-#endif
 }
 
 static int
@@ -240,9 +236,6 @@
        int dir;
 {
 
-#ifndef IPSEC_PCBCACHE
-       return EINVAL;
-#else
        switch (dir) {
        case IPSEC_DIR_INBOUND:
        case IPSEC_DIR_OUTBOUND:
@@ -271,7 +264,6 @@
        pcbsp->cachegen[dir] = sp_cachegen;
 
        return 0;
-#endif
 }
 
 static int