 @@ -1,14 +1,14 @@
-/*	$NetBSD: key.c,v 1.226 2017/09/27 07:27:29 ozaki-r Exp $	*/
+/*	$NetBSD: key.c,v 1.227 2017/09/27 09:55:52 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 $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,27 +22,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.226 2017/09/27 07:27:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.227 2017/09/27 09:55:52 ozaki-r Exp $");
 /*
  * This code is referd to RFC 2367
  */
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_gateway.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/types.h>
 @@ -794,43 +794,45 @@ static void key_timehandler(void *);
 static void key_timehandler_work(struct work *, void *);
 static struct callout	key_timehandler_ch;
 static struct workqueue	*key_timehandler_wq;
 static struct work	key_timehandler_wk;
 u_int
 key_sp_refcnt(const struct secpolicy *sp)
+{
 	/* FIXME */
 	return 0;
+}
 #ifdef NET_MPSAFE
 static void
 key_spd_pserialize_perform(void)
+{
 	KASSERT(mutex_owned(&key_spd.lock));
 	while (key_spd.psz_performing)
 		cv_wait(&key_spd.cv_psz, &key_spd.lock);
 	key_spd.psz_performing = true;
 	mutex_exit(&key_spd.lock);
 	pserialize_perform(key_spd.psz);
 	mutex_enter(&key_spd.lock);
 	key_spd.psz_performing = false;
 	cv_broadcast(&key_spd.cv_psz);
+}
 #endif
 /*
  * Remove the sp from the key_spd.splist and wait for references to the sp
  * to be released. key_spd.lock must be held.
  */
 static void
 key_unlink_sp(struct secpolicy *sp)
+{
 	KASSERT(mutex_owned(&key_spd.lock));
 	sp->state = IPSEC_SPSTATE_DEAD;
 	SPLIST_WRITER_REMOVE(sp);
 @@ -1487,43 +1489,45 @@ key_freesp_so(struct secpolicy **sp)
 	KASSERT(sp != NULL);
 	KASSERT(*sp != NULL);
 	if ((*sp)->policy == IPSEC_POLICY_ENTRUST ||
 	    (*sp)->policy == IPSEC_POLICY_BYPASS)
 		return;
 	KASSERTMSG((*sp)->policy == IPSEC_POLICY_IPSEC,
 	    "invalid policy %u", (*sp)->policy);
 	KEY_SP_UNREF(&sp);
+}
 #endif
 #ifdef NET_MPSAFE
 static void
 key_sad_pserialize_perform(void)
+{
 	KASSERT(mutex_owned(&key_sad.lock));
 	while (key_sad.psz_performing)
 		cv_wait(&key_sad.cv_psz, &key_sad.lock);
 	key_sad.psz_performing = true;
 	mutex_exit(&key_sad.lock);
 	pserialize_perform(key_sad.psz);
 	mutex_enter(&key_sad.lock);
 	key_sad.psz_performing = false;
 	cv_broadcast(&key_sad.cv_psz);
+}
 #endif
 /*
  * Remove the sav from the savlist of its sah and wait for references to the sav
  * to be released. key_sad.lock must be held.
  */
 static void
 key_unlink_sav(struct secasvar *sav)
+{
 	KASSERT(mutex_owned(&key_sad.lock));
 	SAVLIST_WRITER_REMOVE(sav);