Changeset 557c7d0 in mainline for uspace/srv/net/nil/eth/eth_module.c

Timestamp:

2010-12-19T10:12:49Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8dd039a, f568ee7

Parents:

11658b64 (diff), 40dc422 (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) (1 diff)

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

@@ -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;