xnu-792.22.5.tar.gz

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

diff --git a/bsd/netat/adsp_Timer.c b/bsd/netat/adsp_Timer.c
index edcc8ffca96296def35a4ca752c4475696641988..9f551fd0eda0eef8f75a0c343f448242a6f5b074 100644 (file)
--- a/bsd/netat/adsp_Timer.c
+++ b/bsd/netat/adsp_Timer.c
@@ -76,13 +76,10 @@ void TimerTick();
 void TrashSession(sp)          /* (CCBPtr sp) */
     CCBPtr sp;
 {
 void TrashSession(sp)          /* (CCBPtr sp) */
     CCBPtr sp;
 {

-    int s;

 
 

-    ATDISABLE(s, sp->lock);

     sp->userFlags |= eTearDown;
     sp->removing = 1;
     sp->state = sClosed;
     sp->userFlags |= eTearDown;
     sp->removing = 1;
     sp->state = sClosed;

-    ATENABLE(s, sp->lock);

 
     DoClose(sp, errAborted, 1);
 }
 
     DoClose(sp, errAborted, 1);
 }


@@ -100,10 +97,8 @@ void DoTimerElem(t) /* (TimerElemPtr t) */
     TimerElemPtr t;
 {
     CCBPtr sp;
     TimerElemPtr t;
 {
     CCBPtr sp;

-    int        s;

 
     sp = (CCBPtr)((Ptr)t - t->type); /* Recover stream pointer for this guy */
 
     sp = (CCBPtr)((Ptr)t - t->type); /* Recover stream pointer for this guy */

-    ATDISABLE(s, sp->lock);

        
     if (t->type == kFlushTimerType) { /* flush write data time just fired */
        if (sp->sData) {        /* If there's any data, flush it. */
        
     if (t->type == kFlushTimerType) { /* flush write data time just fired */
        if (sp->sData) {        /* If there's any data, flush it. */


@@ -142,7 +137,6 @@ void DoTimerElem(t) /* (TimerElemPtr t) */
     } else if (t->type == kProbeTimerType) {
        if (sp->state == sOpen || sp->state == sClosing) {
            if (--sp->probeCntr == 0) { /* Connection died */
     } else if (t->type == kProbeTimerType) {
        if (sp->state == sOpen || sp->state == sClosing) {
            if (--sp->probeCntr == 0) { /* Connection died */

-               ATENABLE(s, sp->lock);

                TrashSession(sp);
                return;
            } else {
                TrashSession(sp);
                return;
            } else {


@@ -157,7 +151,6 @@ void DoTimerElem(t) /* (TimerElemPtr t) */
            {
                if (--sp->openRetrys == 0) { /* Oops, didn't open */
                    sp->state = sClosed;
            {
                if (--sp->openRetrys == 0) { /* Oops, didn't open */
                    sp->state = sClosed;

-                   ATENABLE(s, sp->lock);

                    DoClose(sp, errOpening, 1);
                    return;
                }               /* open failed */
                    DoClose(sp, errOpening, 1);
                    return;
                }               /* open failed */


@@ -175,11 +168,9 @@ void DoTimerElem(t) /* (TimerElemPtr t) */
        dPrintf(D_M_ADSP, D_L_ERROR, ("DoTimerElem:Unknown timer type!\n"));
     }
 
        dPrintf(D_M_ADSP, D_L_ERROR, ("DoTimerElem:Unknown timer type!\n"));
     }
 

-    ATENABLE(s, sp->lock);

        return;
        
 send:
        return;
        
 send:

-    ATENABLE(s, sp->lock);

     CheckSend(sp);
 }
 
     CheckSend(sp);
 }