Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-smp

--HG--
extra : convert_revision : 19dc01e1c0d2c0ba6b4d804b902429fb0a6a5552

1 files changed, 2 insertions, 3 deletions

diff --git a/dev/etherpkt.cc b/dev/etherpkt.cc
index 9eda89e9d..273b8ee64 100644
--- a/dev/etherpkt.cc
+++ b/dev/etherpkt.cc
@@ -34,17 +34,16 @@
 using namespace std;
 
 void
-EtherPacket::serialize(ostream &os)
+PacketData::serialize(ostream &os)
 {
     SERIALIZE_SCALAR(length);
     SERIALIZE_ARRAY(data, length);
 }
 
 void
-EtherPacket::unserialize(Checkpoint *cp, const string &section)
+PacketData::unserialize(Checkpoint *cp, const string &section)
 {
     UNSERIALIZE_SCALAR(length);
     data = new uint8_t[length];
     UNSERIALIZE_ARRAY(data, length);
 }
-