little bit of formatting

clean up debugging a bit

dev/ns_gige.cc:
    little bit of formatting
    don't break in the debugger if a packet is dropped when the
    receiver is disabled since it can realistically happen

--HG--
extra : convert_revision : 364efa3eb16990db191085f5b847c3bb255a173c

diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 28c25dc35bb1385ec81276790b354c65c47b6fc5..108f2616cfb0d27d57e81b2f6ee4953620321957 100644 (file)
--- 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;
     }