Changeset 50c06df in mainline for uspace/lib/c/generic/net/icmp_common.c

Timestamp:

2011-01-21T13:07:18Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

7d540c8

Parents:

e2b1548 (diff), 5d00e40 (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:

Merged development

File:

• uspace/lib/c/generic/net/icmp_common.c (modified) (2 diffs)

uspace/lib/c/generic/net/icmp_common.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libc 
+/** @addtogroup libc
  *  @{
  */
@@ -38 +38 @@
 #include <net/modules.h>
 #include <net/icmp_common.h>
-
 #include <ipc/services.h>
 #include <ipc/icmp.h>
-
 #include <sys/time.h>
 #include <async.h>
 
-/** Connects to the ICMP module.
+/** Connect to the ICMP module.
  *
- * @param service       The ICMP module service. Ignored parameter.
- * @param[in] timeout   The connection timeout in microseconds. No timeout if
- *                      set to zero.
- * @return              The ICMP module phone on success.
- * @return              ETIMEOUT if the connection timeouted.
+ * @param[in] timeout Connection timeout in microseconds, zero
+ *                    for no timeout.
+ *
+ * @return ICMP module phone on success.
+ * @return ETIMEOUT if the connection timeouted.
+ *
  */
-int icmp_connect_module(services_t service, suseconds_t timeout)
+int icmp_connect_module(suseconds_t timeout)
 {
-        int phone;
-
-        phone = connect_to_service_timeout(SERVICE_ICMP, timeout);
-        if (phone >= 0)
-                async_req_0_0(phone, NET_ICMP_INIT);
-
-        return phone;
+        return connect_to_service_timeout(SERVICE_ICMP, timeout);
 }