Changeset 41811af in mainline for uspace/lib/net/netif/netif_skel.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/lib/net/netif/netif_skel.c (modified) (3 diffs)

uspace/lib/net/netif/netif_skel.c

@@ -54 +54 @@
 #include <nil_remote.h>
 
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
+
 DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t);
 
@@ -288 +291 @@
         *count = 0;
         
+        if (!IPC_GET_IMETHOD(*call))
+                return EOK;
+        
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_PHONE_HUNGUP:
-                return EOK;
-        
         case NET_NETIF_PROBE:
                 return netif_probe_req_local(0, IPC_GET_DEVICE(*call),
@@ -385 +388 @@
                 
                 /* End if said to either by the message or the processing result */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
+                if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP))
                         return;