Changeset cf2af94 in mainline for uspace/lib/c/generic/net/icmp_api.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/c/generic/net/icmp_api.c (modified) (3 diffs)

uspace/lib/c/generic/net/icmp_api.c

@@ -41 +41 @@
 #include <net/modules.h>
 #include <net/ip_codes.h>
-
 #include <async.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <errno.h>
-
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/icmp.h>
@@ -81 +78 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         if (addrlen <= 0)
@@ -87 +84 @@
 
         message_id = async_send_5(icmp_phone, NET_ICMP_ECHO, size, timeout, ttl,
-            tos, (ipcarg_t) dont_fragment, NULL);
+            tos, (sysarg_t) dont_fragment, NULL);
 
-        // send the address
+        /* Send the address */
         async_data_write_start(icmp_phone, addr, (size_t) addrlen);