Changeset 19a1800 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 with the current development

File:

• uspace/srv/net/nil/eth/eth.c (modified) (3 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -43 +43 @@
 #include <str.h>
 #include <errno.h>
-
-#include <ipc/ipc.h>
 #include <ipc/nil.h>
 #include <ipc/net.h>
 #include <ipc/services.h>
-
 #include <net/modules.h>
 #include <net_checksum.h>
@@ -242 +239 @@
                         nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall),
                             IPC_GET_STATE(*icall));
-                        ipc_answer_0(iid, EOK);
+                        async_answer_0(iid, EOK);
                         break;
                 case NET_NIL_RECEIVED:
@@ -251 +248 @@
                                     IPC_GET_DEVICE(*icall), packet, 0);
                         
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 default:
-                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
+                        async_answer_0(iid, (sysarg_t) ENOTSUP);
                 }