Changeset 6a44ee4 in mainline for uspace/srv/net/netif/lo/lo.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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) (4 diffs)

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

@@ -39 +39 @@
 #include <stdio.h>
 #include <str.h>
+#include <ns.h>
 #include <ipc/services.h>
 #include <ipc/nil.h>
@@ -147 +148 @@
         null_device_stats((device_stats_t *) (*device)->specific);
         (*device)->device_id = device_id;
-        (*device)->nil_phone = -1;
         (*device)->state = NETIF_STOPPED;
         int index = netif_device_map_add(&netif_globals.device_map,
@@ -164 +164 @@
 int netif_initialize(void)
 {
-        return async_connect_to_me(PHONE_NS, SERVICE_LO, 0, 0, NULL);
+        return service_register(SERVICE_LO);
 }
 
@@ -201 +201 @@
         } while (next);
         
-        int phone = device->nil_phone;
+        async_sess_t *nil_sess = netif_globals.nil_sess;
         fibril_rwlock_write_unlock(&netif_globals.lock);
         
-        nil_received_msg(phone, device_id, packet, sender);
+        nil_received_msg(nil_sess, device_id, packet, sender);
         
         fibril_rwlock_write_lock(&netif_globals.lock);