svn commit: r238498 - head/sys/contrib/pf/net

[Gleb Smirnoff]

Author: glebius
Date: Sun Jul 15 19:10:00 2012
New Revision: 238498
URL: http://svn.freebsd.org/changeset/base/238498

Log:
  Use M_NOWAIT while holding the pf giant lock.

Modified:
  head/sys/contrib/pf/net/pf_if.c

Modified: head/sys/contrib/pf/net/pf_if.c
==============================================================================
--- head/sys/contrib/pf/net/pf_if.c	Sun Jul 15 19:05:58 2012	(r238497)
+++ head/sys/contrib/pf/net/pf_if.c	Sun Jul 15 19:10:00 2012	(r238498)
@@ -506,8 +506,7 @@ pfi_dynaddr_setup(struct pf_addr_wrap *a
 	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