Changeset c4fb95d3 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2011-02-18T20:04:56Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d011038

Parents:

87e373b (diff), 8b1ea2d4 (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/il/ip/ip.c (modified) (5 diffs)

uspace/srv/net/il/ip/ip.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <str.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/net.h>
@@ -67 +66 @@
 #include <net_checksum.h>
 #include <icmp_client.h>
-#include <icmp_interface.h>
+#include <icmp_remote.h>
 #include <ip_client.h>
 #include <ip_interface.h>
@@ -1596 +1595 @@
                         rc = ip_device_state_message(IPC_GET_DEVICE(*icall),
                             IPC_GET_STATE(*icall));
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
@@ -1610 +1609 @@
                         }
                         
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
@@ -1616 +1615 @@
                         rc = ip_mtu_changed_message(IPC_GET_DEVICE(*icall),
                             IPC_GET_MTU(*icall));
-                        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);
                 }