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

Timestamp:

2011-01-31T20:32:33Z (14 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/tl/icmp/icmp.c (modified) (3 diffs)

uspace/srv/net/tl/icmp/icmp.c

@@ -41 +41 @@
 #include <stdint.h>
 #include <str.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/net.h>
@@ -628 +627 @@
                         }
                         
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 case IPC_M_PHONE_HUNGUP:
@@ -634 +633 @@
                         continue;
                 default:
-                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
+                        async_answer_0(iid, (sysarg_t) ENOTSUP);
                 }