 @@ -1,14 +1,14 @@
-/*	$NetBSD: npf_os.c,v 1.5 2017/01/03 00:58:05 rmind Exp $	*/
+/*	$NetBSD: npf_os.c,v 1.6 2017/01/27 17:25:34 ryo Exp $	*/
 /*-
  * Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This material is based upon work partially supported by The
  * NetBSD Foundation under a contract with Mindaugas Rasiukevicius.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * NPF main: dynamic load/initialisation and unload routines.
  */
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.5 2017/01/03 00:58:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.6 2017/01/27 17:25:34 ryo Exp $");
 #ifdef _KERNEL_OPT
 #include "pf.h"
 #if NPF > 0
 #error "NPF and PF are mutually exclusive; please select one"
 #endif
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 @@ -55,26 +55,27 @@ __KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1
 #include <sys/socketvar.h>
 #include <sys/uio.h>
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
 #endif
 #include "npf_impl.h"
 #include "npfkern.h"
 #ifdef _KERNEL
 #ifndef _MODULE
 #include "opt_modular.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include "ioconf.h"
 #endif
 /*
  * Module and device structures.
  */
 #ifndef _MODULE
 /*
  * Modular kernels load drivers too early, and we need percpu to be inited
  * So we make this misc; a better way would be to have early boot and late
  * boot drivers.
  */
 @@ -386,28 +387,30 @@ npf_ifaddrhook(void *arg, u_long cmd, vo
+	}
 	npf_ifaddr_sync(npf, ifa->ifa_ifp);
+}
 /*
  * npf_pfil_register: register pfil(9) hooks.
  */
 int
 npf_pfil_register(bool init)
+{
 	npf_t *npf = npf_getkernctx();
 	int error = 0;
 #ifndef NET_MPSAFE
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	/* Init: interface re-config and attach/detach hook. */
 	if (!npf_ph_if) {
 		npf_ph_if = pfil_head_get(PFIL_TYPE_IFNET, 0);
 		if (!npf_ph_if) {
 			error = ENOENT;
 			goto out;
+		}
 		error = pfil_add_ihook(npf_ifhook, NULL,
 		    PFIL_IFNET, npf_ph_if);
 		KASSERT(error == 0);
 @@ -442,56 +445,62 @@ npf_pfil_register(bool init)
 	if (npf_ph_inet6) {
 		error = pfil_add_hook(npfkern_packet_handler, npf,
 		    PFIL_ALL, npf_ph_inet6);
 		KASSERT(error == 0);
+	}
 	/*
 	 * It is necessary to re-sync all/any interface address tables,
 	 * since we did not listen for any changes.
 	 */
 	npf_ifaddr_syncall(npf);
 	pfil_registered = true;
 out:
 #ifndef NET_MPSAFE
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
 	return error;
+}
 /*
  * npf_pfil_unregister: unregister pfil(9) hooks.
  */
 void
 npf_pfil_unregister(bool fini)
+{
 	npf_t *npf = npf_getkernctx();
 #ifndef NET_MPSAFE
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	if (fini && npf_ph_if) {
 		(void)pfil_remove_ihook(npf_ifhook, NULL,
 		    PFIL_IFNET, npf_ph_if);
 		(void)pfil_remove_ihook(npf_ifaddrhook, NULL,
 		    PFIL_IFADDR, npf_ph_if);
+	}
 	if (npf_ph_inet) {
 		(void)pfil_remove_hook(npfkern_packet_handler, npf,
 		    PFIL_ALL, npf_ph_inet);
+	}
 	if (npf_ph_inet6) {
 		(void)pfil_remove_hook(npfkern_packet_handler, npf,
 		    PFIL_ALL, npf_ph_inet6);
+	}
 	pfil_registered = false;
 #ifndef NET_MPSAFE
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 bool
 npf_pfil_registered_p(void)
+{
 	return pfil_registered;
+}
 #endif