Changeset 7494fb4 in mainline for uspace/srv/net/net/net_standalone.c

Timestamp:

2010-11-13T19:12:37Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c7137738

Parents:

63a1e60 (diff), 71e3289 (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_standalone.c (modified) (3 diffs)

uspace/srv/net/net/net_standalone.c

@@ -42 +42 @@
 #include <ipc/ipc.h>
 #include <ipc/net.h>
+#include <errno.h>
 
 #include <ip_interface.h>
@@ -60 +61 @@
 int net_initialize_build(async_client_conn_t client_connection)
 {
-        ERROR_DECLARE;
+        int rc;
         
         task_id_t task_id = spawn("/srv/ip");
@@ -66 +67 @@
                 return EINVAL;
         
-        ERROR_PROPAGATE(add_module(NULL, &net_globals.modules, IP_NAME,
-            IP_FILENAME, SERVICE_IP, task_id, ip_connect_module));
+        rc = add_module(NULL, &net_globals.modules, IP_NAME,
+            IP_FILENAME, SERVICE_IP, task_id, ip_connect_module);
+        if (rc != EOK)
+                return rc;
         
         if (!spawn("/srv/icmp"))