diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/netatm/uni | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-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/uni')
-rw-r--r-- | sys/netatm/uni/sscf_uni.c | 2 | ||||
-rw-r--r-- | sys/netatm/uni/sscop.c | 2 | ||||
-rw-r--r-- | sys/netatm/uni/uniarp.c | 2 | ||||
-rw-r--r-- | sys/netatm/uni/uniarp_cache.c | 2 | ||||
-rw-r--r-- | sys/netatm/uni/uniarp_vcm.c | 6 | ||||
-rw-r--r-- | sys/netatm/uni/uniip.c | 2 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_decode.c | 2 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_msg.c | 24 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_subr.c | 26 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_vc_state.c | 24 |
10 files changed, 46 insertions, 46 deletions
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c index b5ff7d0..a0c3d67 100644 --- a/sys/netatm/uni/sscf_uni.c +++ b/sys/netatm/uni/sscf_uni.c @@ -213,7 +213,7 @@ sscf_uni_inst(ssp, cvp) /* * Allocate our control block */ - uvp = uma_zalloc(sscf_uni_zone, M_WAITOK); + uvp = uma_zalloc(sscf_uni_zone, 0); if (uvp == NULL) return (ENOMEM); uvp->uv_ustate = UVU_INST; diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c index 6374f30..e555307 100644 --- a/sys/netatm/uni/sscop.c +++ b/sys/netatm/uni/sscop.c @@ -258,7 +258,7 @@ sscop_inst(ssp, cvp) /* * Allocate our control block */ - sop = uma_zalloc(sscop_zone, M_WAITOK); + sop = uma_zalloc(sscop_zone, 0); if (sop == NULL) return (ENOMEM); diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c index 0de56b8..e946937 100644 --- a/sys/netatm/uni/uniarp.c +++ b/sys/netatm/uni/uniarp.c @@ -713,7 +713,7 @@ uniarp_client_mode(uip, aap) * Now, get an arp entry for the server connection */ uip->uip_arpstate = UIAS_CLIENT_POPEN; - uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO); + uap = uma_zalloc(uniarp_zone, M_ZERO); if (uap == NULL) { UNIIP_ARP_TIMER(uip, 1 * ATM_HZ); return; diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c index dbfe402..10c780a 100644 --- a/sys/netatm/uni/uniarp_cache.c +++ b/sys/netatm/uni/uniarp_cache.c @@ -126,7 +126,7 @@ uniarp_cache_svc(uip, ip, atm, atmsub, origin) * If there aren't any entries yet, create one */ if ((ipuap == NULL) && (nouap == NULL)) { - ipuap = uma_zalloc(uniarp_zone, M_WAITOK); + ipuap = uma_zalloc(uniarp_zone, 0); if (ipuap == NULL) return (ENOMEM); ipuap->ua_dstip.s_addr = ip->s_addr; diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c index ac1c167..cfc081c 100644 --- a/sys/netatm/uni/uniarp_vcm.c +++ b/sys/netatm/uni/uniarp_vcm.c @@ -133,7 +133,7 @@ uniarp_pvcopen(ivp) /* * Get an arp map entry */ - uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO); + uap = uma_zalloc(uniarp_zone, M_ZERO); if (uap == NULL) return (MAP_FAILED); @@ -279,7 +279,7 @@ uniarp_svcout(ivp, dst) /* * We're a client with an open VCC to the server, get a new arp entry */ - uap = uma_zalloc(uniarp_zone, M_WAITOK); + uap = uma_zalloc(uniarp_zone, 0); if (uap == NULL) { (void) splx(s); return (MAP_FAILED); @@ -440,7 +440,7 @@ uniarp_svcin(ivp, dst, dstsub) /* * No info in the cache - get a new arp entry */ - uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO); + uap = uma_zalloc(uniarp_zone, M_ZERO); if (uap == NULL) { (void) splx(s); return (MAP_FAILED); diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c index 3635523..7bdb100 100644 --- a/sys/netatm/uni/uniip.c +++ b/sys/netatm/uni/uniip.c @@ -188,7 +188,7 @@ uniip_ipact(inp) /* * Get a new interface control block */ - uip = uma_zalloc(uniip_zone, M_WAITOK | M_ZERO); + uip = uma_zalloc(uniip_zone, M_ZERO); if (uip == NULL) return (ENOMEM); diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c index aa49fda..c15d02e 100644 --- a/sys/netatm/uni/unisig_decode.c +++ b/sys/netatm/uni/unisig_decode.c @@ -67,7 +67,7 @@ __RCSID("@(#) $FreeBSD$"); #endif #define ALLOC_IE(ie) do { \ - (ie) = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); \ + (ie) = uma_zalloc(unisig_ie_zone, M_ZERO); \ if ((ie) == NULL) \ return (ENOMEM); \ } while (0) diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c index a002426..a193d00 100644 --- a/sys/netatm/uni/unisig_msg.c +++ b/sys/netatm/uni/unisig_msg.c @@ -294,7 +294,7 @@ unisig_send_setup(usp, uvp) /* * Get memory for a SETUP message */ - setup = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO); + setup = uma_zalloc(unisig_msg_zone, M_ZERO); if (setup == NULL) { err = ENOMEM; goto done; @@ -320,7 +320,7 @@ unisig_send_setup(usp, uvp) * specify one in the attribute block */ if (ap->calling.tag != T_ATM_PRESENT) { - setup->msg_ie_cgad = uma_zalloc(unisig_ie_zone, M_WAITOK); + setup->msg_ie_cgad = uma_zalloc(unisig_ie_zone, 0); if (setup->msg_ie_cgad == NULL) { err = ENOMEM; goto done; @@ -379,11 +379,11 @@ unisig_send_release(usp, uvp, msg, cause) /* * Get memory for a RELEASE message */ - rls_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO); + rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO); if (rls_msg == NULL) { return(ENOMEM); } - cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); + cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO); if (cause_ie == NULL) { uma_zfree(unisig_msg_zone, rls_msg); return(ENOMEM); @@ -455,11 +455,11 @@ unisig_send_release_complete(usp, uvp, msg, cause) /* * Get memory for a RELEASE COMPLETE message */ - rls_cmp = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO); + rls_cmp = uma_zalloc(unisig_msg_zone, M_ZERO); if (rls_cmp == NULL) { return(ENOMEM); } - cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); + cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO); if (cause_ie == NULL) { uma_zfree(unisig_msg_zone, rls_cmp); return(ENOMEM); @@ -534,16 +534,16 @@ unisig_send_status(usp, uvp, msg, cause) /* * Get memory for a STATUS message */ - stat_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO); + stat_msg = uma_zalloc(unisig_msg_zone, M_ZERO); if (stat_msg == NULL) { return(ENOMEM); } - cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); + cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO); if (cause_ie == NULL) { uma_zfree(unisig_msg_zone, stat_msg); return(ENOMEM); } - clst_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); + clst_ie = uma_zalloc(unisig_ie_zone, M_ZERO); if (clst_ie == NULL) { uma_zfree(unisig_msg_zone, stat_msg); uma_zfree(unisig_ie_zone, cause_ie); @@ -679,7 +679,7 @@ unisig_rcv_restart(usp, msg) /* * Get memory for a RESTART ACKNOWLEDGE message */ - rsta_msg = uma_zalloc(unisig_msg_zone, M_WAITOK); + rsta_msg = uma_zalloc(unisig_msg_zone, 0); if (rsta_msg == NULL) { return; } @@ -772,7 +772,7 @@ unisig_rcv_setup(usp, msg) /* * Get a new VCCB for the connection */ - uvp = uma_zalloc(unisig_vc_zone, M_WAITOK | M_ZERO); + uvp = uma_zalloc(unisig_vc_zone, M_ZERO); if (uvp == NULL) { return; } @@ -842,7 +842,7 @@ unisig_rcv_msg(usp, m) /* * Get storage for the message */ - msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO); + msg = uma_zalloc(unisig_msg_zone, M_ZERO); if (msg == NULL) { err = ENOMEM; goto done; diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c index 31cd1a4..8a91fb6 100644 --- a/sys/netatm/uni/unisig_subr.c +++ b/sys/netatm/uni/unisig_subr.c @@ -275,7 +275,7 @@ unisig_open_vcc(usp, cvp) /* * Allocate control block for VCC */ - uvp = uma_zalloc(unisig_vc_zone, M_WAITOK | M_ZERO); + uvp = uma_zalloc(unisig_vc_zone, M_ZERO); if (uvp == NULL) { return(ENOMEM); } @@ -897,7 +897,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->aal.tag == T_ATM_PRESENT) { if (!msg->msg_ie_aalp) { msg->msg_ie_aalp = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_aalp == NULL) { err = ENOMEM; goto done; @@ -955,7 +955,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->traffic.tag == T_ATM_PRESENT) { if (!msg->msg_ie_clrt) { msg->msg_ie_clrt = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_clrt == NULL) { err = ENOMEM; goto done; @@ -1012,7 +1012,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->bearer.tag == T_ATM_PRESENT) { if (!msg->msg_ie_bbcp) { msg->msg_ie_bbcp = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_bbcp == NULL) { err = ENOMEM; goto done; @@ -1040,7 +1040,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->bhli.tag == T_ATM_PRESENT) { if (!msg->msg_ie_bhli) { msg->msg_ie_bhli = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_bhli == NULL) { err = ENOMEM; goto done; @@ -1080,7 +1080,7 @@ unisig_set_attrs(usp, msg, ap) ap->blli.tag_l3 == T_ATM_PRESENT) { if (!msg->msg_ie_blli) { msg->msg_ie_blli = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_blli == NULL) { err = ENOMEM; goto done; @@ -1165,7 +1165,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->called.tag == T_ATM_PRESENT) { if (!msg->msg_ie_cdad) { msg->msg_ie_cdad = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_cdad == NULL) { err = ENOMEM; goto done; @@ -1181,7 +1181,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->called.subaddr.address_format != T_ATM_ABSENT) { if (!msg->msg_ie_cdsa) { msg->msg_ie_cdsa = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_cdsa == NULL) { err = ENOMEM; goto done; @@ -1203,7 +1203,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->calling.tag == T_ATM_PRESENT) { if (!msg->msg_ie_cgad) { msg->msg_ie_cgad = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_cgad == NULL) { err = ENOMEM; goto done; @@ -1220,7 +1220,7 @@ unisig_set_attrs(usp, msg, ap) T_ATM_ABSENT) { if (!msg->msg_ie_cgsa) { msg->msg_ie_cgsa = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_cgsa == NULL) { err = ENOMEM; goto done; @@ -1241,7 +1241,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->qos.tag == T_ATM_PRESENT) { if (!msg->msg_ie_qosp) { msg->msg_ie_qosp = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_qosp == NULL) { err = ENOMEM; goto done; @@ -1273,7 +1273,7 @@ unisig_set_attrs(usp, msg, ap) ap->transit.v.length != 0) { if (!msg->msg_ie_trnt) { msg->msg_ie_trnt = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_trnt == NULL) { err = ENOMEM; goto done; @@ -1298,7 +1298,7 @@ unisig_set_attrs(usp, msg, ap) if (ap->cause.tag == T_ATM_PRESENT) { if (!msg->msg_ie_caus) { msg->msg_ie_caus = uma_zalloc(unisig_ie_zone, - M_WAITOK | M_ZERO); + M_ZERO); if (msg->msg_ie_caus == NULL) { err = ENOMEM; goto done; diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c index 3c88cba..6c5bc36 100644 --- a/sys/netatm/uni/unisig_vc_state.c +++ b/sys/netatm/uni/unisig_vc_state.c @@ -456,7 +456,7 @@ unisig_vc_act04(usp, uvp, msg) vpi = msg->msg_ie_cnid->ie_cnid_vpci; vci = msg->msg_ie_cnid->ie_cnid_vci; } else { - iep = uma_zalloc(unisig_ie_zone, M_WAITOK); + iep = uma_zalloc(unisig_ie_zone, 0); if (iep == NULL) return (ENOMEM); iep->ie_ident = UNI_IE_CNID; @@ -548,10 +548,10 @@ unisig_vc_act05(usp, uvp, msg) /* * Send a RELEASE message */ - rls_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO); + rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO); if (rls_msg == NULL) return(ENOMEM); - cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); + cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO); if (cause_ie == NULL) { uma_zfree(unisig_msg_zone, rls_msg); return(ENOMEM); @@ -668,7 +668,7 @@ unisig_vc_act06(usp, uvp, msg) * No--VCI must have been specified earlier */ if (!uvp->uv_vci) { - iep = uma_zalloc(unisig_ie_zone, M_WAITOK); + iep = uma_zalloc(unisig_ie_zone, 0); if (iep == NULL) return(ENOMEM); iep->ie_ident = UNI_IE_CNID; @@ -742,7 +742,7 @@ unisig_vc_act06(usp, uvp, msg) /* * Get memory for a CONNECT ACK message */ - cack_msg = uma_zalloc(unisig_msg_zone, M_WAITOK); + cack_msg = uma_zalloc(unisig_msg_zone, 0); if (cack_msg == NULL) return(ENOMEM); @@ -1058,7 +1058,7 @@ unisig_vc_act09(usp, uvp, msg) int rc; struct unisig_msg *conn_msg; - conn_msg = uma_zalloc(unisig_msg_zone, M_WAITOK); + conn_msg = uma_zalloc(unisig_msg_zone, 0); if (conn_msg == NULL) return(ENOMEM); @@ -1389,7 +1389,7 @@ unisig_vc_act15(usp, uvp, msg) } } if (cause == UNI_IE_CAUS_MISSING) { - iep = uma_zalloc(unisig_ie_zone, M_WAITOK); + iep = uma_zalloc(unisig_ie_zone, 0); if (iep == NULL) return(ENOMEM); iep->ie_ident = UNI_IE_CNID; @@ -1611,7 +1611,7 @@ unisig_vc_act20(usp, uvp, msg) /* * Get memory for a STATUS ENQUIRY message */ - stat_msg = uma_zalloc(unisig_msg_zone, M_WAITOK); + stat_msg = uma_zalloc(unisig_msg_zone, 0); if (stat_msg == NULL) return(ENOMEM); @@ -1757,15 +1757,15 @@ unisig_vc_act22(usp, uvp, msg) /* * Get memory for a STATUS message */ - status = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO); + status = uma_zalloc(unisig_msg_zone, M_ZERO); if (status == NULL) return(ENOMEM); - callst_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); + callst_ie = uma_zalloc(unisig_ie_zone, M_ZERO); if (callst_ie == NULL) { uma_zfree(unisig_msg_zone, status); return(ENOMEM); } - cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); + cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO); if (cause_ie == NULL) { uma_zfree(unisig_msg_zone, status); uma_zfree(unisig_ie_zone, callst_ie); @@ -1859,7 +1859,7 @@ unisig_vc_act23(usp, uvp, msg) /* * Get memory for the ADD PARTY REJECT message */ - apr_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO); + apr_msg = uma_zalloc(unisig_msg_zone, M_ZERO); if (apr_msg == NULL) return(ENOMEM); |