[src/trunk]: src/sys/netipsec Remove ipsecrequest#sav

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f843e9f5bf3a
branches:  trunk
changeset: 355251:f843e9f5bf3a
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Jul 21 04:50:11 2017 +0000

description:
Remove ipsecrequest#sav

diffstat:

 sys/netipsec/ipsec.c     |   5 ++---
 sys/netipsec/ipsec.h     |   3 +--
 sys/netipsec/key.c       |  10 ++--------
 sys/netipsec/key_debug.c |   7 ++-----
 4 files changed, 7 insertions(+), 18 deletions(-)

diffs (109 lines):

diff -r 6b718b0a62be -r f843e9f5bf3a sys/netipsec/ipsec.c
--- a/sys/netipsec/ipsec.c      Fri Jul 21 04:43:42 2017 +0000
+++ b/sys/netipsec/ipsec.c      Fri Jul 21 04:50:11 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.c,v 1.109 2017/07/21 04:39:08 ozaki-r Exp $      */
+/*     $NetBSD: ipsec.c,v 1.110 2017/07/21 04:50:11 ozaki-r Exp $      */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $       */
 /*     $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.109 2017/07/21 04:39:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.110 2017/07/21 04:50:11 ozaki-r Exp $");
 
 /*
  * IPsec controller part.
@@ -1313,7 +1313,6 @@
                memcpy(&(*q)->saidx.src, &p->saidx.src, sizeof((*q)->saidx.src));
                memcpy(&(*q)->saidx.dst, &p->saidx.dst, sizeof((*q)->saidx.dst));
 
-               (*q)->sav = NULL;
                (*q)->sp = dst;
 
                q = &((*q)->next);
diff -r 6b718b0a62be -r f843e9f5bf3a sys/netipsec/ipsec.h
--- a/sys/netipsec/ipsec.h      Fri Jul 21 04:43:42 2017 +0000
+++ b/sys/netipsec/ipsec.h      Fri Jul 21 04:50:11 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.h,v 1.54 2017/07/21 04:39:08 ozaki-r Exp $       */
+/*     $NetBSD: ipsec.h,v 1.55 2017/07/21 04:50:11 ozaki-r Exp $       */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $       */
 /*     $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $  */
 
@@ -110,7 +110,6 @@
                                /* if __ss_len == 0 then no address specified.*/
        u_int level;            /* IPsec level defined below. */
 
-       struct secasvar *sav;   /* place holder of SA for use */
        struct secpolicy *sp;   /* back pointer to SP */
 };
 
diff -r 6b718b0a62be -r f843e9f5bf3a sys/netipsec/key.c
--- a/sys/netipsec/key.c        Fri Jul 21 04:43:42 2017 +0000
+++ b/sys/netipsec/key.c        Fri Jul 21 04:50:11 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.190 2017/07/21 04:43:42 ozaki-r Exp $        */
+/*     $NetBSD: key.c,v 1.191 2017/07/21 04:50:11 ozaki-r Exp $        */
 /*     $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $        */
 /*     $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $   */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.190 2017/07/21 04:43:42 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.191 2017/07/21 04:50:11 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -1277,11 +1277,6 @@
        struct ipsecrequest *isr = sp->req, *nextisr;
 
        while (isr != NULL) {
-               if (isr->sav != NULL) {
-                       KEY_FREESAV(&isr->sav);
-                       isr->sav = NULL;
-               }
-
                nextisr = isr->next;
                kmem_intr_free(isr, sizeof(*isr));
                isr = nextisr;
@@ -1538,7 +1533,6 @@
                        memcpy(&(*p_isr)->saidx.dst, paddr, paddr->sa_len);
                }
 
-               (*p_isr)->sav = NULL;
                (*p_isr)->sp = newsp;
 
                /* initialization for the next. */
diff -r 6b718b0a62be -r f843e9f5bf3a sys/netipsec/key_debug.c
--- a/sys/netipsec/key_debug.c  Fri Jul 21 04:43:42 2017 +0000
+++ b/sys/netipsec/key_debug.c  Fri Jul 21 04:50:11 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key_debug.c,v 1.17 2017/04/26 03:16:06 ozaki-r Exp $   */
+/*     $NetBSD: key_debug.c,v 1.18 2017/07/21 04:50:11 ozaki-r Exp $   */
 /*     $FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $      */
 
@@ -33,7 +33,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.17 2017/04/26 03:16:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.18 2017/07/21 04:50:11 ozaki-r Exp $");
 #endif
 
 #if defined(_KERNEL_OPT)
@@ -479,9 +479,6 @@
 
                        printf("  level=%u\n", isr->level);
                        kdebug_secasindex(&isr->saidx);
-
-                       if (isr->sav != NULL)
-                               kdebug_secasv(isr->sav);
                }
                printf("  }\n");
            }