summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2004-07-09 11:50:40 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2004-07-09 11:50:40 -0400
commitbbbfebd88578ce069a8e1b9b3a3ed03d51eb3b39 (patch)
tree883a51df48986187b8ac9f74a64baaf2555b278e /dev
parent10446ec4aec2e3e6ad9039b78260c0b3e6bd22f4 (diff)
parent7b2691d53725318810f78c712dbbe4733c319ef8 (diff)
downloadgem5-bbbfebd88578ce069a8e1b9b3a3ed03d51eb3b39.tar.xz
Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/m5clean --HG-- extra : convert_revision : 78beb2735c6536ce3e639d59c99e755e9139f4f1
Diffstat (limited to 'dev')
-rw-r--r--dev/ns_gige.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index f88fc507f..68a50bcce 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -1889,11 +1889,7 @@ NSGigE::txKick()
descDmaWrites++;
descDmaWrBytes += txDmaLen;
- if (doTxDmaWrite())
- goto exit;
-
transmit();
-
txPacket = 0;
if (txHalt) {
@@ -1902,6 +1898,9 @@ NSGigE::txKick()
txHalt = false;
} else
txState = txAdvance;
+
+ if (doTxDmaWrite())
+ goto exit;
}
} else {
DPRINTF(EthernetSM, "this descriptor isn't done yet\n");