summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-01-12 04:06:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-01-12 04:06:27 +0000
commit4246f61d36d8437e9b6723fbaa9a4d6998e4a83c (patch)
tree3531a80785a6a9934e6beef99217fa59970ca314 /sys/kern
parent057507b82ec2921c5aed937b6d2aec1724c21ad0 (diff)
Since ifinit() is now safe to be called earlier, call it just before
configure(), since some upcoming changes will require it. ok henning
Diffstat (limited to 'sys/kern')
-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);