Changeset 2b96463 in mainline for uspace/srv/net/net/net.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/srv/net/net/net.c (modified) (2 diffs)

uspace/srv/net/net/net.c

@@ -326 +326 @@
 static int net_module_start(async_client_conn_t client_connection)
 {
-        sysarg_t phonehash;
         int rc;
         
@@ -338 +337 @@
                 goto out;
         
-        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL, NULL);
         if (rc != EOK)
                 goto out;