Changeset 7bdcc45 in mainline for uspace/srv/net/netif/lo/lo.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/netif/lo/lo.c (modified) (2 diffs)

uspace/srv/net/netif/lo/lo.c

@@ -164 +164 @@
 int netif_initialize(void)
 {
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
 
         return REGISTER_ME(SERVICE_LO, &phonehash);
@@ -262 +262 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;