xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ether79c970: fix mistake

Browse source 
fix bug introduced by amd64 support:

forgot to update ring index i on receive. surprisingly
this was working until there where more than one packet
to process. sorry.

ilock the controller while processing rings. this should
be fixed and use kprocs instead.
This commit is contained in:
cinap_lenrek 2014-06-09 07:21:36 +02:00
parent 01b5ac1402
commit 858d3e39ab
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/9/pc/ether79c970.c
View file

@ -404,6 +404,7 @@ intrloop:
* until a descriptor is encountered still owned by the chip.
*/
if(csr0 & Rint){
ilock(ctlr);
i = ctlr->rdrx;
dre = &ctlr->rdr[i];
while(!(dre->md1 & Own)){
@ -435,16 +436,17 @@ intrloop:
dre->md2 = 0;
dre->md1 = Own|(-Rbsize & 0xFFFF);
ctlr->rdrx = NEXT(ctlr->rdrx, Nrdre);
dre = &ctlr->rdr[ctlr->rdrx];
i = ctlr->rdrx = NEXT(ctlr->rdrx, Nrdre);
dre = &ctlr->rdr[i];
}
iunlock(ctlr);
}
/*
* Transmitter interrupt: wakeup anyone waiting for a free descriptor.
*/
if(csr0 & Tint){
lock(ctlr);
ilock(ctlr);
while(ctlr->ntq){
i = ctlr->tdri;
dre = &ctlr->tdr[i];
@ -474,7 +476,7 @@ intrloop:
ctlr->tdri = NEXT(ctlr->tdri, Ntdre);
}
txstart(ether);
unlock(ctlr);
iunlock(ctlr);
}
goto intrloop;
}