Module Name: src
Committed By: jmcneill
Date: Sun Oct 18 20:39:53 UTC 2015
Modified Files:
src/sys/net/npf: npf.c
Log Message:
Defer initialization of built-in npf module until other pseudo-devices
are initialized. MODULE_CLASS_DRIVER modules are now initialized before
autoconfiguration starts, but npf_init has a dependency on percpu(9) which
doesn't work until CPUs have attached (at least on ARM).
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/net/npf/npf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf.c
diff -u src/sys/net/npf/npf.c:1.25 src/sys/net/npf/npf.c:1.26
--- src/sys/net/npf/npf.c:1.25 Sun Oct 18 18:48:01 2015
+++ src/sys/net/npf/npf.c Sun Oct 18 20:39:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.25 2015/10/18 18:48:01 christos Exp $ */
+/* $NetBSD: npf.c,v 1.26 2015/10/18 20:39:53 jmcneill Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.25 2015/10/18 18:48:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.26 2015/10/18 20:39:53 jmcneill Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -160,7 +160,12 @@ npf_modcmd(modcmd_t cmd, void *arg)
switch (cmd) {
case MODULE_CMD_INIT:
+#if defined(_MODULE)
return npf_init();
+#else
+ /* initialized by npfattach */
+ return 0;
+#endif
case MODULE_CMD_FINI:
return npf_fini();
case MODULE_CMD_AUTOUNLOAD:
@@ -177,8 +182,7 @@ npf_modcmd(modcmd_t cmd, void *arg)
void
npfattach(int nunits)
{
-
- /* Void. */
+ npf_init();
}
static int
