diff options
| author | harti <harti@FreeBSD.org> | 2003-07-23 14:28:57 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2003-07-23 14:28:57 +0000 |
| commit | f8b34e3f70219ed6642f2c3ed7430361969ccccf (patch) | |
| tree | 9fe86b328b35bc3515a752c557d6999aa602cfe7 /sys/netatm/uni/uniarp.c | |
| parent | 162e49f535eeecc1626f095ecec2e27292d2dd24 (diff) | |
| download | FreeBSD-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.c')
| -rw-r--r-- | sys/netatm/uni/uniarp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c index a34c31e..843bc4a 100644 --- a/sys/netatm/uni/uniarp.c +++ b/sys/netatm/uni/uniarp.c @@ -703,9 +703,10 @@ uniarp_client_mode(uip, aap) /* * Now, get an arp entry for the server connection + * May be called from timeout - don't wait. */ uip->uip_arpstate = UIAS_CLIENT_POPEN; - uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO); + uap = uma_zalloc(uniarp_zone, M_NOWAIT | M_ZERO); if (uap == NULL) { UNIIP_ARP_TIMER(uip, 1 * ATM_HZ); return; |
