Changeset f1fae414 in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/tcp/tcp.c (modified) (2 diffs)

uspace/srv/net/tl/tcp/tcp.c

@@ -2442 +2442 @@
  * @param[in]     iid   Message identifier.
  * @param[in,out] icall Message parameters.
- *
+ * @param[in]     arg   Local argument.
  */
-static void tcp_receiver(ipc_callid_t iid, ipc_call_t *icall)
+static void tcp_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         packet_t *packet;
@@ -2483 +2483 @@
         tcp_globals.net_phone = net_phone;
         
-        tcp_globals.icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
+        tcp_globals.icmp_phone = icmp_connect_module();
         tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP,
             SERVICE_TCP, tcp_receiver);