Changeset 8e189ef in mainline for uspace/srv/net/net/net.c

Timestamp:

2010-11-14T17:25:55Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

481b212

Parents:

982e3d8 (diff), a9db9b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/net/net/net.c (modified) (2 diffs)

uspace/srv/net/net/net.c

@@ -275 +275 @@
         measured_strings_initialize(&net_globals.configuration);
         
-        // TODO: dynamic configuration
+        /* TODO: dynamic configuration */
         rc = read_configuration();
         if (rc != EOK)
@@ -347 +347 @@
  *
  * The network interface configuration is searched first.
- &
+ *
  * @param[in]  netif_conf    The network interface configuration setting.
  * @param[out] configuration The found configured values.