summaryrefslogtreecommitdiffstats
path: root/sys/netatm/ipatm/ipatm_vcm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netatm/ipatm/ipatm_vcm.c')
-rw-r--r--sys/netatm/ipatm/ipatm_vcm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 35744cb..a14f1f1 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -578,8 +578,9 @@ ipatm_createsvc(ifp, daf, dst, sivp)
/*
* Allocate IP VCC
+ * May be called from timeout - don't wait.
*/
- ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+ ivp = uma_zalloc(ipatm_vc_zone, M_NOWAIT);
if (ivp == NULL) {
err = ENOMEM;
goto done;
@@ -930,8 +931,9 @@ ipatm_incoming(tok, cop, ap, tokp)
/*
* Allocate IP VCC
+ * May be called from timeout - don't wait.
*/
- ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+ ivp = uma_zalloc(ipatm_vc_zone, M_NOWAIT);
if (ivp == NULL) {
err = ENOMEM;
cause = T_ATM_CAUSE_UNSPECIFIED_RESOURCE_UNAVAILABLE;
OpenPOWER on IntegriCloud