--- a/src/devices/csma/csma-net-device.h	Mon Oct 01 14:14:31 2007 +0200
+++ b/src/devices/csma/csma-net-device.h	Mon Oct 01 14:15:56 2007 +0200
@@ -203,7 +203,7 @@
    * @see CsmaChannel
    * \param p a reference to the received packet
    */
-  void Receive (const Packet& p);
+  void Receive (Ptr<Packet> p);
 
   /**
    * @brief Make and return a MAC multicast address using the provided
@@ -279,7 +279,7 @@
    * \param protocolNumber In some protocols, identifies the type of
    * payload contained in this packet.
    */
-  void AddHeader (Packet& p, Mac48Address dest, 
+  void AddHeader (Ptr<Packet> p, Mac48Address dest, 
                   uint16_t protocolNumber);
   /**
    * Removes, from a packet of data, all headers and trailers that
@@ -291,7 +291,7 @@
    * \return Returns true if the packet should be forwarded up the
    * protocol stack.
    */
-  bool ProcessHeader (Packet& p, uint16_t & param);
+  bool ProcessHeader (Ptr<Packet> p, uint16_t & param);
 
 private:
   // disable copy constructor and operator =
@@ -316,7 +316,7 @@
    * \param protocolNumber -- this parameter is not used here
    * \return true if success, false on failure
    */
-  virtual bool SendTo (const Packet& p, const Address& dest, uint16_t protocolNumber);
+  virtual bool SendTo (Ptr<Packet> p, const Address& dest, uint16_t protocolNumber);
 
   /**
    * Start Sending a Packet Down the Wire.
@@ -438,7 +438,7 @@
    * currently transmitting) or packet that is currently being
    * transmitted.
    */
-  Packet m_currentPkt;
+  Ptr<Packet> m_currentPkt;
   /**
    * The CsmaChannel to which this CsmaNetDevice has been
    * attached.
@@ -461,8 +461,8 @@
    * @see class CallBackTraceSource
    * @see class TraceResolver
    */
-  CallbackTraceSource<const Packet &> m_rxTrace;
-  CallbackTraceSource<const Packet &> m_dropTrace;
+  CallbackTraceSource<Ptr<const Packet> > m_rxTrace;
+  CallbackTraceSource<Ptr<const Packet> > m_dropTrace;
 
 };