Merge zizzer:/bk/newmem

into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

src/mem/tport.cc:
    Merge PacketPtr changes

--HG--
extra : convert_revision : 0329c5803a3df67af3dda89bd9d4753fd1a286d1

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mem/tport.cc b/src/mem/tport.cc
index 350b4c8e3..5c5aaa3da 100644
--- a/src/mem/tport.cc
+++ b/src/mem/tport.cc
@@ -33,12 +33,11 @@
 void
 SimpleTimingPort::recvFunctional(PacketPtr pkt)
 {
-    //First check queued events
     std::list<PacketPtr>::iterator i = transmitList.begin();
     std::list<PacketPtr>::iterator end = transmitList.end();
     bool cont = true;
 
-    while (i != end && cont) {
+    while (i != end) {
         PacketPtr target = *i;
         // If the target contains data, and it overlaps the
         // probed request, need to update data
@@ -46,8 +45,9 @@ SimpleTimingPort::recvFunctional(PacketPtr pkt)
             fixPacket(pkt, target);
 
     }
+
     //Then just do an atomic access and throw away the returned latency
-    if (cont)
+    if (pkt->result != Packet::Success)
         recvAtomic(pkt);
 }