Changeset 41811af in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/srv/net/nil/nildummy/nildummy.c (modified) (2 diffs)

uspace/srv/net/nil/nildummy/nildummy.c

@@ -54 +54 @@
 #include <nil_skel.h>
 
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
+
 #include "nildummy.h"
 
@@ -393 +396 @@
         
         *answer_count = 0;
+        
+        if (!IPC_GET_IMETHOD(*call))
+                return EOK;
+        
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_PHONE_HUNGUP:
-                return EOK;
-        
         case NET_NIL_DEVICE:
                 return nildummy_device_message(IPC_GET_DEVICE(*call),