commit 94ce9712787c59720727890893ded8a533158e2d
author Ali Saidi <saidi@eecs.umich.edu> Thu Dec 15 00:09:46 2011 -0500
committer Ali Saidi <saidi@eecs.umich.edu> Thu Dec 15 00:09:46 2011 -0500
tree 07368889866d11ef9438126632498c09cc5ffd6a
parent 6ef9691035623ba6945e237a41f0dca04db637bb

IO: Fix bug in DMA Device where receiving a snoop on DMA port would cause a panic.

--HG--
extra : rebase_source : 8152d4fa7d7354c9f150a450ae0710e95141ba4b

src/dev/io_device.cc

diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index 5c13b50..dab1f76 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -142,13 +142,9 @@
 
         pkt->reinitNacked();
         queueDma(pkt, true);
+    } else if (pkt->isRequest() && recvSnoops) {
+        return true; 
     } else if (pkt->senderState) {
-        if (recvSnoops) {
-            if (pkt->isRequest()) {
-                return true;
-            }
-        }
-
         DmaReqState *state;
         backoffTime >>= 2;