From 7227ab5f223eb5f4d3ce80ea16bff5f87c3300b6 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 26 Aug 2007 21:45:40 -0700
Subject: Merge with head

--HG--
extra : convert_revision : cc73b9aaf73e9dacf52f3350fa591e67ca4ccee6
---
 src/mem/bridge.hh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mem/bridge.hh')

diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh
index 82001948e..df48eb8c5 100644
--- a/src/mem/bridge.hh
+++ b/src/mem/bridge.hh
@@ -78,17 +78,19 @@ class Bridge : public MemObject
           public:
             Tick ready;
             PacketPtr pkt;
+            bool nackedHere;
             Packet::SenderState *origSenderState;
             short origSrc;
             bool expectResponse;
 
             PacketBuffer(PacketPtr _pkt, Tick t, bool nack = false)
-                : ready(t), pkt(_pkt),
-                  origSenderState(_pkt->senderState), origSrc(_pkt->getSrc()),
+                : ready(t), pkt(_pkt), nackedHere(nack),
+                  origSenderState(_pkt->senderState),
+                  origSrc(nack ? _pkt->getDest() : _pkt->getSrc() ),
                   expectResponse(_pkt->needsResponse() && !nack)
 
             {
-                if (!pkt->isResponse() && !nack && !pkt->wasNacked())
+                if (!pkt->isResponse() && !nack)
                     pkt->senderState = this;
             }
 
-- 
cgit v1.2.3