diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-06-23 16:27:17 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-06-23 16:27:17 -0400 |
| commit | 0460a78829c000f033d703bb814ca39a835014a0 (patch) | |
| tree | b3a9f74af1d4a33559f21c5b5ed11a3052911b6c /dev | |
| parent | e8bcecd0a04638e9d9e6306cbe515c40e9ba0817 (diff) | |
| parent | cad549d7aaefece708495842f2be5e6532a27bb7 (diff) | |
| download | gem5-0460a78829c000f033d703bb814ca39a835014a0.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision : a0a8fea7224913ef106dc733182abd938feab64d
Diffstat (limited to 'dev')
| -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; } |