sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

--HG--
extra : convert_revision : 35075f75f7e31e0500b964ec45db3019eea06c76
This commit is contained in:
Nathan Binkert 2005-10-21 19:18:28 -04:00
commit 336ae93d3c
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev/ns_gige.cc
View file

@ -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;

3
dev/sinic.cc
View file

@ -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;