trace: reimplement the DTRACE function so it doesn't use a vector

[gem5.git] / src / dev / ethertap.hh

diff --git a/src/dev/ethertap.hh b/src/dev/ethertap.hh
index be3d73a2427e35ca46deb1c5793364642c424832..2f38d57b49ad2f13305ed3557e1b5e3c7c314ea7 100644 (file)
--- a/src/dev/ethertap.hh
+++ b/src/dev/ethertap.hh
@@ -39,8 +39,8 @@
 #include <string>
 
 #include "base/pollevent.hh"
-#include "dev/etherobject.hh"
 #include "dev/etherint.hh"
+#include "dev/etherobject.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherTap.hh"
 #include "sim/eventq.hh"
@@ -65,8 +65,8 @@ class EtherTap : public EtherObject
     int socket;
     char *buffer;
     int buflen;
-    int32_t buffer_offset;
-    int32_t data_len;
+    uint32_t buffer_offset;
+    uint32_t data_len;
 
     EtherDump *dump;
 
@@ -90,8 +90,7 @@ class EtherTap : public EtherObject
         EtherTap *tap;
 
       public:
-        TxEvent(EtherTap *_tap)
-            : Event(&mainEventQueue), tap(_tap) {}
+        TxEvent(EtherTap *_tap) : tap(_tap) {}
         void process() { tap->retransmit(); }
         virtual const char *description() const
             { return "EtherTap retransmit"; }