summaryrefslogtreecommitdiffstats
path: root/sys/netatm/ipatm
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
committeralfred <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
commitbf8e8a6e8f0bd9165109f0a258730dd242299815 (patch)
treef16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/netatm/ipatm
parent2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff)
downloadFreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip
FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/netatm/ipatm')
-rw-r--r--sys/netatm/ipatm/ipatm_if.c2
-rw-r--r--sys/netatm/ipatm/ipatm_vcm.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 49dbf48..5dca971 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -124,7 +124,7 @@ ipatm_nifstat(cmd, nip, arg)
/*
* Get a new interface block
*/
- inp = uma_zalloc(ipatm_nif_zone, M_WAITOK);
+ inp = uma_zalloc(ipatm_nif_zone, 0);
if (inp == NULL) {
err = ENOMEM;
break;
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 14cf7cc..76c8a55 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -382,7 +382,7 @@ ipatm_openpvc(pvp, sivp)
/*
* Allocate IP VCC block
*/
- ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+ ivp = uma_zalloc(ipatm_vc_zone, 0);
if (ivp == NULL) {
err = ENOMEM;
goto done;
@@ -585,7 +585,7 @@ ipatm_createsvc(ifp, daf, dst, sivp)
/*
* Allocate IP VCC
*/
- ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+ ivp = uma_zalloc(ipatm_vc_zone, 0);
if (ivp == NULL) {
err = ENOMEM;
goto done;
@@ -937,7 +937,7 @@ ipatm_incoming(tok, cop, ap, tokp)
/*
* Allocate IP VCC
*/
- ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+ ivp = uma_zalloc(ipatm_vc_zone, 0);
if (ivp == NULL) {
err = ENOMEM;
cause = T_ATM_CAUSE_UNSPECIFIED_RESOURCE_UNAVAILABLE;
OpenPOWER on IntegriCloud