[src/trunk]: src/sys/netipsec Move key_init_spidx_bymsghdr to just before spi...

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

details:   https://anonhg.NetBSD.org/src/rev/ee59c1e661ef
branches:  trunk
changeset: 353995:ee59c1e661ef
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed May 31 09:50:04 2017 +0000

description:
Move key_init_spidx_bymsghdr to just before spidx is used (NFC)

diffstat:

 sys/netipsec/key.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 57a473b90507 -r ee59c1e661ef sys/netipsec/key.c
--- a/sys/netipsec/key.c        Wed May 31 08:19:44 2017 +0000
+++ b/sys/netipsec/key.c        Wed May 31 09:50:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.155 2017/05/31 05:05:38 ozaki-r Exp $        */
+/*     $NetBSD: key.c,v 1.156 2017/05/31 09:50:04 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.155 2017/05/31 05:05:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.156 2017/05/31 09:50:04 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -2106,9 +2106,6 @@
                return key_senderror(so, m, EINVAL);
        }
 
-       /* make secindex */
-       key_init_spidx_bymsghdr(&spidx, mhp);
-
        xpl0 = (struct sadb_x_policy *)mhp->ext[SADB_X_EXT_POLICY];
 
        /* checking the direciton. */
@@ -2121,6 +2118,9 @@
                return key_senderror(so, m, EINVAL);
        }
 
+       /* make secindex */
+       key_init_spidx_bymsghdr(&spidx, mhp);
+
        /* Is there SP in SPD ? */
        sp = key_getsp(&spidx);
        if (sp == NULL) {