3 files changed, 12 insertions(+), 9 deletions(-)

M port/devlance.c
M port/proc.c
M port/stream.c

@@ 750,7 750,7 @@ lancekproc(void *arg)
 			 *  See if a queue exists for this packet type.
 			 */
 			p = l.rp[l.rl];
-			t = (p->type[1]<<8) | p->type[0];
+			t = (p->type[0]<<8) | p->type[1];
 			len = m->cntflags - 4;
 			lancedebq("in", p, len);
 			for(e = &l.e[0]; e < &l.e[Ntypes]; e++){

@@ 231,7 231,7 @@ sleep1(Rendez *r, int (*f)(void*), void *arg)
 	 */
 	p = u->p;
 	if(r->p)
-		print("double sleep %d\n", r->p->pid);
+		print("double sleep %d %d\n", r->p->pid, p->pid);
 	p->r = r;
 	p->wokeup = 0;
 	p->state = Wakeme;

@@ 571,6 571,7 @@ streamclose(Chan *c)
 {
 	Queue *q, *nq;
 	Block *bp;
+	Stream *s = c->stream;
 
 	/*
 	 *  if not open, ignore it


@@ 581,8 582,9 @@ streamclose(Chan *c)
 	/*
 	 *  decrement the reference cound
 	 */
-	lock(c->stream);
-	if(--(c->stream->inuse) != 0){
+	lock(s);
+	if(s->inuse != 1){
+		s->inuse--;
 		unlock(c->stream);
 		return;
 	}


@@ 590,21 592,22 @@ streamclose(Chan *c)
 	/*
 	 *  descend the stream closing the queues
 	 */
-	for(q = c->stream->procq; q; q = q->next){
+	for(q = s->procq; q; q = q->next){
 		if(q->info->close)
 			(*q->info->close)(q->other);
-		if(q == c->stream->devq->other)
+		if(q == s->devq->other)
 			break;
 	}
 	/*
 	 *  ascend the stream freeing the queues
 	 */
-	for(q = c->stream->devq; q; q = nq){
+	for(q = s->devq; q; q = nq){
 		nq = q->next;
 		freeq(q);
 	}
-	c->stream->id = c->stream->dev = c->stream->type = 0;
-	unlock(c->stream);
+	s->id = s->dev = s->type = 0;
+	s->inuse--;
+	unlock(s);
 }
 
 /*