Changeset fcae007 in mainline for uspace/srv/net/net/net.c

Timestamp:

2012-01-22T13:23:21Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

08cc26b

Parents:

d9bbe45 (diff), 10a5479d (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 with mainline

File:

• uspace/srv/net/net/net.c (modified) (5 diffs)

uspace/srv/net/net/net.c

@@ -56 +56 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
+#include <fibril_synch.h>
 #include <loc.h>
 #include <nic.h>
@@ -76 +77 @@
 DEVICE_MAP_IMPLEMENT(netifs, netif_t);
 LIST_INITIALIZE(netif_list);
+
+static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
 
 /** Add the configured setting to the configuration map.
@@ -294 +297 @@
         printf("%s: Initializing device '%s'\n", NAME, netif->name);
         
-        link_initialize(&netif->netif_list);
-        
         netif->sid = sid;
         netif->sess = loc_service_connect(EXCHANGE_SERIALIZE, netif->sid,
@@ -535 +536 @@
         int rc;
 
+        fibril_mutex_lock(&discovery_lock);
+
         rc = loc_category_get_id(DEVICE_CATEGORY_NIC, &nic_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -569 +572 @@
 
         free(svcs);
+        fibril_mutex_unlock(&discovery_lock);
         return EOK;
 }