Changeset ea28272 in mainline for uspace/srv/net/il/ip/ip_module.c

Timestamp:

2010-12-30T13:43:27Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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/il/ip/ip_module.c (modified) (2 diffs)

uspace/srv/net/il/ip/ip_module.c

@@ -66 +66 @@
 int il_module_start_standalone(async_client_conn_t client_connection)
 {
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         int rc;
         
@@ -80 +80 @@
                 goto out;
         
-        rc = REGISTER_ME(SERVICE_IP, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_IP, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;