--- a/src/devices/csma/csma-net-device.cc	Wed Mar 12 11:35:00 2008 -0700
+++ b/src/devices/csma/csma-net-device.cc	Thu Mar 13 11:10:38 2008 -0700
@@ -45,11 +45,6 @@
   static TypeId tid = TypeId ("CsmaNetDevice")
     .SetParent<NetDevice> ()
     .AddConstructor<CsmaNetDevice> ()
-    .AddAttribute ("Node", "The node with which this device is associated",
-                   TypeId::ATTR_GET | TypeId::ATTR_CONSTRUCT,
-                   Ptr<Node> (0),
-                   MakePtrAccessor (&CsmaNetDevice::m_node),
-                   MakePtrChecker<Node> ())
     .AddAttribute ("Address", "The address of this device.",
                    Mac48Address ("ff:ff:ff:ff:ff:ff"),
                    MakeMac48AddressAccessor (&CsmaNetDevice::m_address),
@@ -702,6 +697,11 @@
 {
   return m_node;
 }
+void 
+CsmaNetDevice::SetNode (Ptr<Node> node)
+{
+  m_node = node;
+}
 bool 
 CsmaNetDevice::NeedsArp (void) const
 {