Changeset 12573db in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-01-31T20:32:33Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37cf3792

Parents:

4fe94c66 (diff), 197ef43 (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) (3 diffs)

uspace/srv/net/net/net.c

@@ -47 +47 @@
 #include <str_error.h>
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/net.h>
@@ -337 +336 @@
                 goto out;
         
-        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL, NULL);
+        rc = async_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL);
         if (rc != EOK)
                 goto out;
@@ -686 +685 @@
          *  - Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {