From b65f365474e6e861275cdab493fd1ad62b98933b Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Wed, 19 Jan 2005 12:43:06 -0500
Subject: fix unserialization of PacketFifo

dev/pktfifo.cc:
    fix unserialization.  calling resize on a list just sticks
    uninitialized garbage into the list.

--HG--
extra : convert_revision : 1cbff596dd0b88560e23b9368ec75a7369beb9d9
---
 dev/pktfifo.cc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'dev')

diff --git a/dev/pktfifo.cc b/dev/pktfifo.cc
index ae82123cf..79a96cc1d 100644
--- a/dev/pktfifo.cc
+++ b/dev/pktfifo.cc
@@ -60,7 +60,6 @@ PacketFifo::unserialize(const string &base, Checkpoint *cp,
     paramIn(cp, section, base + ".packets", fifosize);
 
     fifo.clear();
-    fifo.resize(fifosize);
 
     for (int i = 0; i < fifosize; ++i) {
         PacketPtr p = new PacketData(16384);
-- 
cgit v1.2.3


From 10371be698b411bc068137bf2add0c5a74ec60eb Mon Sep 17 00:00:00 2001
From: Ron Dreslinski <rdreslin@umich.edu>
Date: Wed, 19 Jan 2005 16:26:19 -0500
Subject: Fix serialization of txPacket (need to properly calculate the length
 before serialization)

--HG--
extra : convert_revision : e93321495d19afb86949daf2c14102ffb6bcef41
---
 dev/ns_gige.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dev')

diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index aa47436f7..e799c10d2 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -2352,6 +2352,7 @@ NSGigE::serialize(ostream &os)
     bool txPacketExists = txPacket;
     SERIALIZE_SCALAR(txPacketExists);
     if (txPacketExists) {
+        txPacket->length = txPacketBufPtr - txPacket->data;
         txPacket->serialize("txPacket", os);
         uint32_t txPktBufPtr = (uint32_t) (txPacketBufPtr - txPacket->data);
         SERIALIZE_SCALAR(txPktBufPtr);
-- 
cgit v1.2.3