From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 29 Sep 2005 21:09:53 +0000 (-0400)
Subject: fix for delayed state machine changes
X-Git-Tag: m5_1.1~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f7952f8e1ec0eca045742ab3d3290464e24873d;p=gem5.git

fix for delayed state machine changes

--HG--
extra : convert_revision : db19e3687f48799725a9062e014588d318988cee
---

diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 6aae7b9eb..47cd4d7da 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -1840,6 +1840,8 @@ NSGigE::rxKick()
             CRDD = true;
             goto exit;
         } else {
+            if (rxDmaState != dmaIdle)
+                goto exit;
             rxState = rxDescRead;
             regs.rxdp = rxDescCache.link;
             CRDD = false;
@@ -2286,6 +2288,8 @@ NSGigE::txKick()
             txState = txIdle;
             goto exit;
         } else {
+            if (txDmaState != dmaIdle)
+                goto exit;
             txState = txDescRead;
             regs.txdp = txDescCache.link;
             CTDD = false;