Changeset 2b0db98 in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-01-07T14:02:56Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

6986418

Parents:

d99120f (diff), 0f191a2 (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:

Merged development into lelian/hidd

File:

• uspace/srv/net/net/net.c (modified) (1 diff)

uspace/srv/net/net/net.c

@@ -335 +335 @@
                 goto out;
         
-        rc = REGISTER_ME(SERVICE_NETWORKING, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;