--- a/src/node/net-device.h	Thu Mar 29 16:55:42 2007 +0200
+++ b/src/node/net-device.h	Thu Mar 29 17:07:04 2007 +0200
@@ -29,10 +29,10 @@
 
 namespace ns3 {
 
-class Ipv4L4Demux;
 class Node;
 class TraceResolver;
 class TraceContext;
+class Channel;
 
 /**
  * \brief Network layer to device interface
@@ -72,6 +72,13 @@
   TraceResolver *CreateTraceResolver (TraceContext const &context);
 
   /**
+   * \return the channel this NetDevice is connected to. The value
+   *         returned can be zero if the NetDevice is not yet connected
+   *         to any channel.
+   */
+  Channel *GetChannel (void) const;
+
+  /**
    * \return the current MacAddress of this interface.
    */
   MacAddress GetAddress (void) const;
@@ -218,6 +225,7 @@
   virtual bool SendTo (Packet& p, const MacAddress& dest) = 0;
 
   virtual TraceResolver *DoCreateTraceResolver (TraceContext const &context) = 0;
+  virtual Channel *DoGetChannel (void) const = 0;
   Node*         m_node;
   std::string   m_name;
   uint16_t      m_ifIndex;