diff options
author | Nathan Binkert <nate@binkert.org> | 2008-06-17 21:34:27 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2008-06-17 21:34:27 -0700 |
commit | 8042b8f4c75164c6c6d5a71e171bc7193b85057a (patch) | |
tree | 8d0bf23a605edc5b120a5e31c9f69f2868aa6a3a /src/dev/sinic.cc | |
parent | 163465ac08674125fed1d4e843cab6c1c2bf2033 (diff) | |
download | gem5-8042b8f4c75164c6c6d5a71e171bc7193b85057a.tar.xz |
PacketFifo: Get slack out of the EthPacketData structure. This allows
a packet to exist in multiple FIFOs if desired.
Diffstat (limited to 'src/dev/sinic.cc')
-rw-r--r-- | src/dev/sinic.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dev/sinic.cc b/src/dev/sinic.cc index c63966528..e875a8bcc 100644 --- a/src/dev/sinic.cc +++ b/src/dev/sinic.cc @@ -893,12 +893,12 @@ Device::rxKick() // Grab a new packet from the fifo. vnic->rxPacket = rxFifoPtr++; vnic->rxPacketOffset = 0; - vnic->rxPacketBytes = (*vnic->rxPacket)->length; + vnic->rxPacketBytes = vnic->rxPacket->packet->length; assert(vnic->rxPacketBytes); vnic->rxDoneData = 0; /* scope for variables */ { - IpPtr ip(*vnic->rxPacket); + IpPtr ip(vnic->rxPacket->packet); if (ip) { DPRINTF(Ethernet, "ID is %d\n", ip->id()); vnic->rxDoneData |= Regs::RxDone_IpPacket; @@ -941,7 +941,7 @@ Device::rxKick() Regs::get_RxData_Addr(vnic->RxData)); rxDmaLen = std::min<int>(Regs::get_RxData_Len(vnic->RxData), vnic->rxPacketBytes); - rxDmaData = (*vnic->rxPacket)->data + vnic->rxPacketOffset; + rxDmaData = vnic->rxPacket->packet->data + vnic->rxPacketOffset; rxState = rxCopy; if (rxDmaAddr == 1LL) { rxState = rxCopyDone; |