diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:43:32 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:43:32 +0000 |
| commit | b14e72073db609ec0fb89897afe16fc5a15d3290 (patch) | |
| tree | c89a2417dc919aa1ce54db59627c344530c85d79 /sys/contrib/pf/net/pf_osfp.c | |
| parent | 33ac8108e208b013f6a23863636e022de6effb3a (diff) | |
| download | FreeBSD-src-b14e72073db609ec0fb89897afe16fc5a15d3290.zip FreeBSD-src-b14e72073db609ec0fb89897afe16fc5a15d3290.tar.gz | |
Resolve conflicts created during the import of pf 3.7 Some features are
missing and will be implemented in a second step. This is functional as is.
Tested by: freebsd-pf, pfsense.org
Obtained from: OpenBSD
X-MFC after: never (breaks API/ABI)
Diffstat (limited to 'sys/contrib/pf/net/pf_osfp.c')
| -rw-r--r-- | sys/contrib/pf/net/pf_osfp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/pf/net/pf_osfp.c b/sys/contrib/pf/net/pf_osfp.c index af05330..ce1efee 100644 --- a/sys/contrib/pf/net/pf_osfp.c +++ b/sys/contrib/pf/net/pf_osfp.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $OpenBSD: pf_osfp.c,v 1.9 2004/01/04 20:08:42 pvalchev Exp $ */ +/* $OpenBSD: pf_osfp.c,v 1.10 2004/04/09 19:30:41 frantzen Exp $ */ /* * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org> @@ -255,9 +255,9 @@ pf_osfp_initialize(void) } while(0); #else pool_init(&pf_osfp_entry_pl, sizeof(struct pf_osfp_entry), 0, 0, 0, - "pfosfpen", NULL); + "pfosfpen", &pool_allocator_nointr); pool_init(&pf_osfp_pl, sizeof(struct pf_os_fingerprint), 0, 0, 0, - "pfosfp", NULL); + "pfosfp", &pool_allocator_nointr); #endif SLIST_INIT(&pf_osfp_list); #ifdef __FreeBSD__ |
