Changeset 1affcdf3 in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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) (4 diffs)

uspace/srv/net/net/net.c

@@ -41 +41 @@
 #include <ctype.h>
 #include <ddi.h>
+#include <ns.h>
 #include <errno.h>
 #include <malloc.h>
@@ -339 +340 @@
                 goto out;
         
-        rc = async_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL);
+        rc = service_register(SERVICE_NETWORKING);
         if (rc != EOK)
                 goto out;
@@ -638 +639 @@
         
         *answer_count = 0;
+        
+        if (!IPC_GET_IMETHOD(*call))
+                return EOK;
+        
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_PHONE_HUNGUP:
-                return EOK;
         case NET_NET_GET_DEVICE_CONF:
                 rc = measured_strings_receive(&strings, &data,
@@ -703 +706 @@
                 
                 /* End if told 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;