(FAST_IPSEC): Pull in option header-test for FAST_IPSEC (and IPSEC).

If FAST_IPSEC is configured, attach fast-ipsec transforms after
autoconfiguring devices (perhaps including crypto hardware)
but before starting up network-device packet input.
This commit is contained in:
jonathan 2003-08-06 20:30:38 +00:00
parent 8b2ac878e4
commit 333cceb477

View File

@ -1,4 +1,4 @@
/* $NetBSD: init_main.c,v 1.222 2003/07/30 18:45:32 jonathan Exp $ */
/* $NetBSD: init_main.c,v 1.223 2003/08/06 20:30:38 jonathan Exp $ */
/*
* Copyright (c) 1995 Christopher G. Demetriou. All rights reserved.
@ -42,10 +42,11 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.222 2003/07/30 18:45:32 jonathan Exp $");
__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.223 2003/08/06 20:30:38 jonathan Exp $");
#include "fs_nfs.h"
#include "opt_nfsserver.h"
#include "opt_ipsec.h"
#include "opt_sysv.h"
#include "opt_maxuprc.h"
#include "opt_multiprocessor.h"
@ -84,6 +85,9 @@ __KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.222 2003/07/30 18:45:32 jonathan Exp
#include <sys/user.h>
#include <sys/sysctl.h>
#include <sys/event.h>
#ifdef FAST_IPSEC
#include <netipsec/ipsec.h>
#endif
#ifdef SYSVSHM
#include <sys/shm.h>
#endif
@ -398,6 +402,11 @@ main(void)
for (pdev = pdevinit; pdev->pdev_attach != NULL; pdev++)
(*pdev->pdev_attach)(pdev->pdev_count);
#ifdef FAST_IPSEC
/* Attach network crypto subsystem */
ipsec_attach();
#endif
/*
* Initialize protocols. Block reception of incoming packets
* until everything is ready.