summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2010-01-12 04:06:26 +0000
committerderaadt <deraadt@openbsd.org>2010-01-12 04:06:26 +0000
commit302ab0e5ca6ed71374587cb4d26fa9faa0cdb9f3 (patch)
treea8d9608e4a56999cde1bab500c6c6e3778359e62
parentMove initialization of the MCLGETI ticker to mbinit(), instead of ifinit() (diff)
downloadwireguard-openbsd-302ab0e5ca6ed71374587cb4d26fa9faa0cdb9f3.tar.xz
wireguard-openbsd-302ab0e5ca6ed71374587cb4d26fa9faa0cdb9f3.zip
Since ifinit() is now safe to be called earlier, call it just before
configure(), since some upcoming changes will require it. ok henning
-rw-r--r--sys/kern/init_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index edf32e0e68c..3f63d3d9cfa 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.165 2010/01/01 13:13:58 miod Exp $ */
+/* $OpenBSD: init_main.c,v 1.166 2010/01/12 04:06:26 deraadt Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -343,6 +343,9 @@ main(void *framep)
/* Initialize work queues */
workq_init();
+ /* Initialize the interface/address trees */
+ ifinit();
+
/* Configure the devices */
cpu_configure();
@@ -391,7 +394,6 @@ main(void *framep)
* until everything is ready.
*/
s = splnet();
- ifinit();
domaininit();
if_attachdomain();
splx(s);