Merge zizzer.eecs.umich.edu:/bk/m5

into  ziff.eecs.umich.edu:/z/binkertn/research/m5/head

--HG--
extra : convert_revision : 35075f75f7e31e0500b964ec45db3019eea06c76

2 files changed, 0 insertions, 7 deletions

diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index f6d15b02f..7e7fedc15 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -2531,20 +2531,17 @@ NSGigE::recvPacket(PacketPtr packet)
 
     if (!rxEnable) {
         DPRINTF(Ethernet, "receive disabled...packet dropped\n");
-        interface->recvDone();
         return true;
     }
 
     if (!rxFilterEnable) {
         DPRINTF(Ethernet,
             "receive packet filtering disabled . . . packet dropped\n");
-        interface->recvDone();
         return true;
     }
 
     if (rxFilter(packet)) {
         DPRINTF(Ethernet, "packet filtered...dropped\n");
-        interface->recvDone();
         return true;
     }
 
@@ -2567,7 +2564,6 @@ NSGigE::recvPacket(PacketPtr packet)
     }
 
     rxFifo.push(packet);
-    interface->recvDone();
 
     rxKick();
     return true;
diff --git a/dev/sinic.cc b/dev/sinic.cc
index 0f2fd20ea..0619a63dd 100644
--- a/dev/sinic.cc
+++ b/dev/sinic.cc
@@ -1085,13 +1085,11 @@ Device::recvPacket(PacketPtr packet)
 
     if (!rxEnable) {
         DPRINTF(Ethernet, "receive disabled...packet dropped\n");
-        interface->recvDone();
         return true;
     }
 
     if (rxFilter(packet)) {
         DPRINTF(Ethernet, "packet filtered...dropped\n");
-        interface->recvDone();
         return true;
     }
 
@@ -1104,7 +1102,6 @@ Device::recvPacket(PacketPtr packet)
         return false;
     }
 
-    interface->recvDone();
     devIntrPost(Regs::Intr_RxDone);
     rxKick();
     return true;