SimObjects: Clean up handling of C++ namespaces.

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

diff --git a/src/dev/etherpkt.hh b/src/dev/etherpkt.hh
index 01741b3d58fcdb898543a0f4bbefd52168541351..623895ba8774efa5ed788178f48b5fdc7ec06e8a 100644 (file)
--- a/src/dev/etherpkt.hh
+++ b/src/dev/etherpkt.hh
@@ -24,6 +24,9 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ *          Lisa Hsu
  */
 
 /* @file
@@ -57,20 +60,19 @@ class EthPacketData : public RefCounted
      */
     int length;
 
-    /*
-     * Extra space taken up by the packet in whatever data structure
-     * it is in.
-     *
-     * NOTE: This can only be use by *one* data structure at a time!
-     */
-    int slack;
-
   public:
-    EthPacketData() : data(NULL), length(0), slack(0) { }
+    EthPacketData()
+        : data(NULL), length(0)
+    { }
+
     explicit EthPacketData(size_t size)
-        : data(new uint8_t[size]), length(0), slack(0) { }
-    EthPacketData(std::auto_ptr<uint8_t> d, int l, int s = 0)
-        : data(d.release()), length(l), slack(s) { }
+        : data(new uint8_t[size]), length(0)
+    { }
+
+    EthPacketData(std::auto_ptr<uint8_t> d, int l)
+        : data(d.release()), length(l)
+    { }
+
     ~EthPacketData() { if (data) delete [] data; }
 
   public: