summaryrefslogtreecommitdiffstats
path: root/sys/netatm/uni/uniarp_cache.c
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2003-07-23 14:28:57 +0000
committerharti <harti@FreeBSD.org>2003-07-23 14:28:57 +0000
commitf8b34e3f70219ed6642f2c3ed7430361969ccccf (patch)
tree9fe86b328b35bc3515a752c557d6999aa602cfe7 /sys/netatm/uni/uniarp_cache.c
parent162e49f535eeecc1626f095ecec2e27292d2dd24 (diff)
downloadFreeBSD-src-f8b34e3f70219ed6642f2c3ed7430361969ccccf.zip
FreeBSD-src-f8b34e3f70219ed6642f2c3ed7430361969ccccf.tar.gz
Convert a lot of uma_zalloc() calls to be NOWAIT instead of WAITOK. All
these may be called from contexts where we cannot sleep (callout handlers for example).
Diffstat (limited to 'sys/netatm/uni/uniarp_cache.c')
-rw-r--r--sys/netatm/uni/uniarp_cache.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 3e28912..10b7118 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -117,9 +117,10 @@ uniarp_cache_svc(uip, ip, atm, atmsub, origin)
/*
* If there aren't any entries yet, create one
+ * May be called from netisr - don't wait.
*/
if ((ipuap == NULL) && (nouap == NULL)) {
- ipuap = uma_zalloc(uniarp_zone, M_WAITOK);
+ ipuap = uma_zalloc(uniarp_zone, M_NOWAIT);
if (ipuap == NULL)
return (ENOMEM);
ipuap->ua_dstip.s_addr = ip->s_addr;
OpenPOWER on IntegriCloud