fixed memory leak in bcm driver
This commit is contained in:
parent
8f6173c8bd
commit
61a8b5c803
|
@ -326,17 +326,19 @@ bcmreceive(Ether *edev)
|
|||
}
|
||||
|
||||
static void
|
||||
bcmtransclean(Ether *edev)
|
||||
bcmtransclean(Ether *edev, int dolock)
|
||||
{
|
||||
Ctlr *ctlr;
|
||||
|
||||
ctlr = edev->ctlr;
|
||||
if(dolock)
|
||||
ilock(&ctlr->txlock);
|
||||
while(ctlr->sendcleani != (ctlr->status[4] >> 16)) {
|
||||
freeb(ctlr->sends[ctlr->sendri]);
|
||||
ctlr->sends[ctlr->sendri] = 0;
|
||||
freeb(ctlr->sends[ctlr->sendcleani]);
|
||||
ctlr->sends[ctlr->sendcleani] = 0;
|
||||
ctlr->sendcleani = (ctlr->sendcleani + 1) & (SendRingLen - 1);
|
||||
}
|
||||
if(dolock)
|
||||
iunlock(&ctlr->txlock);
|
||||
}
|
||||
|
||||
|
@ -356,6 +358,11 @@ bcmtransmit(Ether *edev)
|
|||
print("bcm: send queue full\n");
|
||||
break;
|
||||
}
|
||||
if(incr == ctlr->sendcleani) {
|
||||
bcmtransclean(edev, 0);
|
||||
if(incr == ctlr->sendcleani)
|
||||
break;
|
||||
}
|
||||
bp = qget(edev->oq);
|
||||
if(bp == nil) break;
|
||||
next = ctlr->sendr + ctlr->sendri * 4;
|
||||
|
@ -414,7 +421,7 @@ bcminterrupt(Ureg*, void *arg)
|
|||
if(status & LinkStateChange) checklink(edev);
|
||||
// print("bcm: interrupt %8ulx %8ulx\n", ctlr->status[2], ctlr->status[4]);
|
||||
bcmreceive(edev);
|
||||
bcmtransclean(edev);
|
||||
bcmtransclean(edev, 1);
|
||||
bcmtransmit(edev);
|
||||
csr32(ctlr, InterruptMailbox) = tag << 24;
|
||||
iunlock(&ctlr->imlock);
|
||||
|
|
Loading…
Reference in a new issue