diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2005-06-21 13:49:37 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2005-06-21 13:49:37 -0400 |
| commit | e26c73fefa026eb67cea11bcf557e9396068dd66 (patch) | |
| tree | cd5110e076b8deb8a76e6be76165da8f584945ce | |
| parent | 0ee4f32f875d15d6d5e14252c7078a2f3151322c (diff) | |
| parent | 11894d3b4b85160e1cc0c0a20157f89dcd3bae6c (diff) | |
| download | gem5-e26c73fefa026eb67cea11bcf557e9396068dd66.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision : 32a82fce7c12b2a72bc3196a667e96d66b8b0b37
| -rw-r--r-- | dev/ns_gige.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc index 28c25dc35..108f2616c 100644 --- a/dev/ns_gige.cc +++ b/dev/ns_gige.cc @@ -473,8 +473,9 @@ NSGigE::regStats() coalescedTxDesc = totalTxDesc / postedInterrupts; coalescedRxOrn = totalRxOrn / postedInterrupts; - coalescedTotal = (totalSwi + totalRxIdle + totalRxOk + totalRxDesc + totalTxOk - + totalTxIdle + totalTxDesc + totalRxOrn) / postedInterrupts; + coalescedTotal = (totalSwi + totalRxIdle + totalRxOk + totalRxDesc + + totalTxOk + totalTxIdle + totalTxDesc + + totalRxOrn) / postedInterrupts; txBandwidth = txBytes * Stats::constant(8) / simSeconds; rxBandwidth = rxBytes * Stats::constant(8) / simSeconds; @@ -1956,7 +1957,6 @@ NSGigE::txKick() if (txKickTick > curTick) { DPRINTF(EthernetSM, "transmit kick exiting, can't run till %d\n", txKickTick); - return; } @@ -2293,7 +2293,6 @@ NSGigE::recvPacket(PacketPtr packet) if (!rxEnable) { DPRINTF(Ethernet, "receive disabled...packet dropped\n"); - debug_break(); interface->recvDone(); return true; } |