sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge zizzer.eecs.umich.edu:/bk/m5

Browse source 
into shizzle.(none):/home/hsul/work/m5clean

--HG--
extra : convert_revision : 78beb2735c6536ce3e639d59c99e755e9139f4f1
This commit is contained in:
Lisa Hsu 2004-07-09 11:50:40 -04:00
commit bbbfebd885
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dev/ns_gige.cc
View file

@ -1889,11 +1889,7 @@ NSGigE::txKick()
descDmaWrites++; descDmaWrites++;
descDmaWrBytes += txDmaLen; descDmaWrBytes += txDmaLen;
if (doTxDmaWrite())
goto exit;
transmit(); transmit();
txPacket = 0; txPacket = 0;
if (txHalt) { if (txHalt) {
@ -1902,6 +1898,9 @@ NSGigE::txKick()
txHalt = false; txHalt = false;
} else } else
txState = txAdvance; txState = txAdvance;
if (doTxDmaWrite())
goto exit;
} }
} else { } else {
DPRINTF(EthernetSM, "this descriptor isn't done yet\n"); DPRINTF(EthernetSM, "this descriptor isn't done yet\n");