Changeset 973ef9fc in mainline for uspace/srv/net/nil/eth/eth_module.c

Timestamp:

2010-12-25T21:20:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/nil/eth/eth_module.c (modified) (2 diffs)

uspace/srv/net/nil/eth/eth_module.c

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