summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2012-07-15 19:10:00 +0000
committerglebius <glebius@FreeBSD.org>2012-07-15 19:10:00 +0000
commit620ea86f1a48a10983336a5a2cd9f90d439f2a9d (patch)
tree2afe5bcc76de8295c647630c6960ff0f2642df08
parentc0f1fd3e765adc68f5dd781096c7be9768475fff (diff)
downloadFreeBSD-src-620ea86f1a48a10983336a5a2cd9f90d439f2a9d.zip
FreeBSD-src-620ea86f1a48a10983336a5a2cd9f90d439f2a9d.tar.gz
Use M_NOWAIT while holding the pf giant lock.
-rw-r--r--sys/contrib/pf/net/pf_if.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c
index 6336c79..b4491b8 100644
--- a/sys/contrib/pf/net/pf_if.c
+++ b/sys/contrib/pf/net/pf_if.c
@@ -506,8 +506,7 @@ pfi_dynaddr_setup(struct pf_addr_wrap *aw, sa_family_t af)
if (aw->type != PF_ADDR_DYNIFTL)
return (0);
#ifdef __FreeBSD__
- /* XXX: revisit! */
- if ((dyn = pool_get(&V_pfi_addr_pl, PR_WAITOK | PR_ZERO))
+ if ((dyn = pool_get(&V_pfi_addr_pl, PR_NOWAIT | PR_ZERO))
#else
if ((dyn = pool_get(&pfi_addr_pl, PR_WAITOK | PR_LIMITFAIL | PR_ZERO))
#endif
OpenPOWER on IntegriCloud