From ee8c8cbcd89f70d50a770007c6bcaf428ac2f233 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Fri, 20 Feb 2004 15:19:19 -0500
Subject: [PATCH] make etherdump work again

dev/etherdump.cc:
    now that init is automatically called by the framework, don't
    init twice.

--HG--
extra : convert_revision : 16dcdef67aa193ed71ff546e7b255d60f39bf13d
---
 dev/etherdump.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/etherdump.cc b/dev/etherdump.cc
index 6d86adc32..23b3d778e 100644
--- a/dev/etherdump.cc
+++ b/dev/etherdump.cc
@@ -43,11 +43,8 @@ using std::string;
 EtherDump::EtherDump(const string &name, const string &file)
     : SimObject(name)
 {
-    if (!file.empty()) {
+    if (!file.empty())
         stream.open(file.c_str());
-        if (stream.is_open())
-            init();
-    }
 }
 
 #define DLT_EN10MB		1       	// Ethernet (10Mb)
@@ -74,6 +71,9 @@ struct pcap_pkthdr {
 void
 EtherDump::init()
 {
+    if (!stream.is_open())
+        return;
+
     curtime = time(NULL);
     s_freq = ticksPerSecond;
     us_freq = ticksPerSecond / ULL(1000000);
-- 
2.30.2