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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/lib/c/generic/net/icmp_api.c (modified) (2 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>
@@ -89 +86 @@
             tos, (sysarg_t) dont_fragment, NULL);
 
-        // send the address
+        /* Send the address */
         async_data_write_start(icmp_phone, addr, (size_t) addrlen);