# HG changeset patch
# User Christoph Pfister <pfistchr@student.ethz.ch>
# Date 1432986317 -7200
# Node ID a5b99f96e76b4c0bfcf84c042a26bd8ea313453f
# Parent  d02b45a554b52c68cce41e1b3895fb8582a639dd
restore old address if the request cannot be sent

diff -r d02b45a554b5 -r a5b99f96e76b src/mem/addr_mapper.cc
--- a/src/mem/addr_mapper.cc	Tue May 26 03:21:45 2015 -0400
+++ b/src/mem/addr_mapper.cc	Sat May 30 13:45:17 2015 +0200
@@ -128,9 +128,13 @@
     // packets)
     bool successful = masterPort.sendTimingReq(pkt);
 
-    // If not successful, restore the sender state
-    if (!successful && needsResponse) {
-        delete pkt->popSenderState();
+    // If not successful, restore the address and sender state
+    if (!successful) {
+        pkt->setAddr(orig_addr);
+
+        if (needsResponse) {
+            delete pkt->popSenderState();
+        }
     }
 
     return successful;