--- a/src/node/ethernet-header.cc	Sat Jul 28 12:41:53 2007 +0200
+++ b/src/node/ethernet-header.cc	Sat Jul 28 13:14:24 2007 +0200
@@ -29,30 +29,20 @@
 
 namespace ns3 {
 
-bool EthernetHeader::m_enPreambleSfd = false;
+EthernetHeader::EthernetHeader (bool hasPreamble)
+  : m_enPreambleSfd (hasPreamble),
+    m_lengthType (0)
+{}
 
 EthernetHeader::EthernetHeader ()
-{
-  Init();
-}
+  : m_enPreambleSfd (false),
+    m_lengthType (0)
+{}
 
 EthernetHeader::~EthernetHeader ()
 {}
 
 void 
-EthernetHeader::Init()
-{
-  m_preambleSfd = 0;
-  m_lengthType = 0x0;
-}
-
-void 
-EthernetHeader::EnablePreambleSfd (bool enable)
-{
-  m_enPreambleSfd = enable;
-}
-
-void 
 EthernetHeader::SetLengthType (uint16_t lengthType)
 {
   m_lengthType = lengthType;

--- a/src/node/ethernet-header.h	Sat Jul 28 12:41:53 2007 +0200
+++ b/src/node/ethernet-header.h	Sat Jul 28 13:14:24 2007 +0200
@@ -53,15 +53,17 @@
 
   /**
    * \brief Construct a null ethernet header
+   * \param hasPreamble if true, insert and remove an ethernet preamble from the
+   *       packet, if false, does not insert and remove it.
+   */
+  EthernetHeader (bool hasPreamble);
+  /**
+   * \brief Construct a null ethernet header
+   * By default, does not add or remove an ethernet preamble
    */
   EthernetHeader ();
   virtual ~EthernetHeader ();
   /**
-   * \brief Enable or disabled the serialisation of the preamble and
-   * Sfd header fields
-   */
-  static void EnablePreambleSfd (bool enable);
-  /**
    * \param size The size of the payload in bytes
    */
   void SetLengthType (uint16_t size);
@@ -109,15 +111,12 @@
   virtual void SerializeTo (Buffer::Iterator start) const;
   virtual uint32_t DeserializeFrom (Buffer::Iterator start);
 
-  void Init (void);
-
   /**
    * If false, the preamble/sfd are not serialised/deserialised.
    */
-  static bool m_enPreambleSfd;
-
+  bool m_enPreambleSfd;
   uint64_t m_preambleSfd;     /// Value of the Preamble/SFD fields
-  uint16_t m_lengthType : 16; /// Length or type of the packet
+  uint16_t m_lengthType;      /// Length or type of the packet
   MacAddress m_source;        /// Source address
   MacAddress m_destination;   /// Destination address
 };