xnu-1699.32.7.tar.gz

[apple/xnu.git] / bsd / netat / atp_alloc.c

diff --git a/bsd/netat/atp_alloc.c b/bsd/netat/atp_alloc.c
index 208ad056fcace862f30a12edafc13fd0c79c2635..cf9a4375c011727b04249432264e35b8df4da174 100644 (file)
--- a/bsd/netat/atp_alloc.c
+++ b/bsd/netat/atp_alloc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -57,28 +57,25 @@
 #define TRPS_PER_BLK 16
 
 gbuf_t *atp_resource_m = 0;
-extern atlock_t atpgen_lock;
 extern caddr_t atp_free_cluster_list;
-extern void atp_delete_free_clusters();
+extern struct atp_rcb_qhead atp_need_rel;
+
 
 struct atp_trans *atp_trans_alloc(atp)
 struct  atp_state *atp;
 {
-       int s;
        int i;
        gbuf_t *m;
        register struct atp_trans *trp, *trp_array;
 
-       ATDISABLE(s, atpgen_lock);
        if (atp_trans_free_list == 0) {
-               ATENABLE(s, atpgen_lock);
-               if ((m = gbuf_alloc(TRPS_PER_BLK*sizeof(struct atp_trans),PRI_HI)) == 0)
+               if ((m = gbuf_alloc_wait(TRPS_PER_BLK*sizeof(struct atp_trans),
+                   atp == NULL)) == 0)
                        return (struct atp_trans *)0;
                bzero(gbuf_rptr(m), TRPS_PER_BLK*sizeof(struct atp_trans));
                trp_array = (struct atp_trans *)gbuf_rptr(m);
                for (i=0; i < TRPS_PER_BLK-1; i++)
                        trp_array[i].tr_list.next = (struct atp_trans *)&trp_array[i+1];
-               ATDISABLE(s, atpgen_lock);
                gbuf_cont(m) = atp_resource_m;
                atp_resource_m = m;
                trp_array[i].tr_list.next = atp_trans_free_list;
@@ -87,11 +84,9 @@ struct  atp_state *atp;
 
        trp = atp_trans_free_list;
        atp_trans_free_list = trp->tr_list.next;
-       ATENABLE(s, atpgen_lock);
        trp->tr_queue = atp;
        trp->tr_state = TRANS_TIMEOUT;
        trp->tr_local_node = 0;
-       ATLOCKINIT(trp->tr_lock);
        ATEVENTINIT(trp->tr_event);
 
        dPrintf(D_M_ATP_LOW, D_L_TRACE,
@@ -108,13 +103,10 @@ struct  atp_state *atp;
 void atp_trans_free(trp)
 register struct atp_trans *trp;
 {
-       int s;
 
-       ATDISABLE(s, atpgen_lock);
        trp->tr_queue = 0;
        trp->tr_list.next = atp_trans_free_list;
        atp_trans_free_list = trp;
-       ATENABLE(s, atpgen_lock);
 }
 
 /*
@@ -127,16 +119,13 @@ struct atp_rcb *atp_rcb_alloc(atp)
 struct  atp_state *atp;
 {
        register struct atp_rcb *rcbp;
-       int s;
 
-       ATDISABLE(s, atpgen_lock);
        if ((rcbp = atp_rcb_free_list) != NULL) {
                atp_rcb_free_list = rcbp->rc_list.next;
                rcbp->rc_queue = atp;
                rcbp->rc_pktcnt = 0;
                rcbp->rc_local_node = 0;
        }
-       ATENABLE(s, atpgen_lock);
        dPrintf(D_M_ATP_LOW, D_L_TRACE,
                ("atp_rcb_alloc: allocated rcbp 0x%x\n", (u_int) rcbp));
        return(rcbp);
@@ -153,14 +142,11 @@ register struct atp_rcb *rcbp;
        register struct atp_state *atp;
        register int i;
        register int rc_state;
-       int s;
 
        dPrintf(D_M_ATP_LOW, D_L_TRACE,
                ("atp_rcb_free: freeing rcbp 0x%x\n", (u_int) rcbp));
-       ATDISABLE(s, atpgen_lock);
        atp = rcbp->rc_queue;
        if ((rc_state = rcbp->rc_state) == -1) {
-               ATENABLE(s, atpgen_lock);
                dPrintf(D_M_ATP, D_L_WARNING,
                        ("atp_rcb_free(%d): tid=%d,loc=%d,rem=%d\n",
                        0, rcbp->rc_tid,
@@ -172,8 +158,6 @@ register struct atp_rcb *rcbp;
        rcbp->rc_queue = 0;
 
        if (rcbp->rc_timestamp) {
-               extern struct atp_rcb_qhead atp_need_rel;
-
                rcbp->rc_timestamp = 0;
                ATP_Q_REMOVE(atp_need_rel, rcbp, rc_tlist);
                rcbp->rc_tlist.prev = NULL;
@@ -187,7 +171,7 @@ register struct atp_rcb *rcbp;
                        rcbp->rc_snd[i] = 0;
        }
        if (atp_free_cluster_list)
-               atp_delete_free_clusters();
+               atp_delete_free_clusters(NULL);
        if (rc_state != RCB_UNQUEUED) {
                if (rc_state == RCB_PENDING) {
                        ATP_Q_REMOVE(atp->atp_attached, rcbp, rc_list);
@@ -201,5 +185,4 @@ register struct atp_rcb *rcbp;
        }
        rcbp->rc_list.next = atp_rcb_free_list;
        atp_rcb_free_list = rcbp;
-       ATENABLE(s, atpgen_lock);
 }