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

Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

Browse source 
into zizzer.eecs.umich.edu:/z/stever/bk/m5

--HG--
extra : convert_revision : 32a82fce7c12b2a72bc3196a667e96d66b8b0b37
This commit is contained in:
Steve Reinhardt 2005-06-21 13:49:37 -04:00
commit e26c73fefa
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

@ -473,8 +473,9 @@ NSGigE::regStats()
coalescedTxDesc = totalTxDesc / postedInterrupts; coalescedTxDesc = totalTxDesc / postedInterrupts;
coalescedRxOrn = totalRxOrn / postedInterrupts; coalescedRxOrn = totalRxOrn / postedInterrupts;
coalescedTotal = (totalSwi + totalRxIdle + totalRxOk + totalRxDesc + totalTxOk coalescedTotal = (totalSwi + totalRxIdle + totalRxOk + totalRxDesc +
+ totalTxIdle + totalTxDesc + totalRxOrn) / postedInterrupts; totalTxOk + totalTxIdle + totalTxDesc +
totalRxOrn) / postedInterrupts;
txBandwidth = txBytes * Stats::constant(8) / simSeconds; txBandwidth = txBytes * Stats::constant(8) / simSeconds;
rxBandwidth = rxBytes * Stats::constant(8) / simSeconds; rxBandwidth = rxBytes * Stats::constant(8) / simSeconds;
@ -1956,7 +1957,6 @@ NSGigE::txKick()
if (txKickTick > curTick) { if (txKickTick > curTick) {
DPRINTF(EthernetSM, "transmit kick exiting, can't run till %d\n", DPRINTF(EthernetSM, "transmit kick exiting, can't run till %d\n",
txKickTick); txKickTick);
return; return;
} }
@ -2293,7 +2293,6 @@ NSGigE::recvPacket(PacketPtr packet)
if (!rxEnable) { if (!rxEnable) {
DPRINTF(Ethernet, "receive disabled...packet dropped\n"); DPRINTF(Ethernet, "receive disabled...packet dropped\n");
debug_break();
interface->recvDone(); interface->recvDone();
return true; return true;
} }