Changeset 2b96463 in mainline for uspace/lib/c/generic/net/modules.c

Timestamp:

2011-01-28T15:15:11Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3ee48f2, 7a51d75

Parents:

ef8d655 (diff), ae0300b5 (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/modules.c (modified) (1 diff)

uspace/lib/c/generic/net/modules.c

@@ -143 +143 @@
         if (phone >= 0) {
                 /* Request the bidirectional connection */
+                sysarg_t taskhash;
                 sysarg_t phonehash;
                 
-                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash);
+                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &taskhash,
+                    &phonehash);
                 if (rc != EOK) {
                         ipc_hangup(phone);
                         return rc;
                 }
-                async_new_connection(phonehash, 0, NULL, client_receiver);
+                async_new_connection(taskhash, phonehash, 0, NULL,
+                    client_receiver);
         }