--- a/src/devices/csma/csma-ipv4-topology.h	Sun Aug 12 22:43:25 2007 -0700
+++ b/src/devices/csma/csma-ipv4-topology.h	Mon Aug 13 12:08:01 2007 -0700
@@ -94,18 +94,23 @@
 
 
   /** 
-   * \param n1 Node
-   * \param ndNum NetDevice number with which to associate address
-   * \param addr1 Ipv4 Address for ndNum of n1
-   * \param network network mask for ndNum of node n1
+   * \brief Create an Ipv4 interface for a net device and assign an 
+   * Ipv4Address to that interface.
+   *
+   * \param node The node to which to add the new address and corresponding 
+   *        interface.
+   * \param netDeviceNumber The NetDevice index number with which to associate
+   *        the address.
+   * \param address The Ipv4 Address for the interface.
+   * \param network The network mask for the interface
    * 
    * Add an Ipv4Address to the Ipv4 interface associated with the
-   * ndNum CsmaIpv4NetDevices on the provided
-   * CsmaIpv4Channel
+   * ndNum CsmaIpv4NetDevices on the provided CsmaIpv4Channel
    */
-  static void AddIpv4Address(Ptr<Node> n1, int ndNum, 
-                             const Ipv4Address& addr1,
-                             const Ipv4Mask& netmask1);
+  static uint32_t AddIpv4Address(Ptr<Node> node,
+                                 uint32_t netDeviceNumber, 
+                                 const Ipv4Address address,
+                                 const Ipv4Mask mask);
 
   /**
    * \param nd1 Node