--- a/src/devices/bridge/bridge-net-device.cc	Mon Jul 07 12:18:05 2008 +0100
+++ b/src/devices/bridge/bridge-net-device.cc	Mon Jul 07 12:52:48 2008 +0100
@@ -54,7 +54,9 @@
     m_name (""),
     m_ifIndex (0),
     m_mtu (0xffff)
-{}
+{
+  m_channel = CreateObject<BridgeChannel> ();
+}
 
 void
 BridgeNetDevice::ReceiveFromDevice (Ptr<NetDevice> incomingPort, Ptr<Packet> packet, uint16_t protocol,
@@ -188,6 +190,7 @@
   m_node->RegisterProtocolHandler (MakeCallback (&BridgeNetDevice::ReceiveFromDevice, this),
                                    0, bridgePort);
   m_ports.push_back (bridgePort);
+  m_channel->AddChannel (bridgePort->GetChannel ());
 }
 
 void 
@@ -217,7 +220,7 @@
 Ptr<Channel> 
 BridgeNetDevice::GetChannel (void) const
 {
-  return 0;
+  return m_channel;
 }
 
 Address