Changeset 8426912a in mainline for uspace/lib/net/netif/netif_skel.c

Timestamp:

2011-01-14T12:35:19Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d450964

Parents:

6610565b (diff), 08abd81 (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/lib/net/netif/netif_skel.c (modified) (4 diffs)

uspace/lib/net/netif/netif_skel.c

@@ -33 +33 @@
 /** @file
  * Network interface module skeleton implementation.
- * @see netif.h
+ * @see netif_skel.h
  */
 
@@ -52 +52 @@
 #include <adt/measured_strings.h>
 #include <net/device.h>
-#include <nil_interface.h>
 #include <netif_skel.h>
+#include <nil_remote.h>
 
 DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t);
@@ -130 +130 @@
         if (result > NETIF_NULL) {
                 int phone = device->nil_phone;
+                nil_device_state_msg(phone, device_id, result);
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                nil_device_state_msg(phone, device_id, result);
                 return EOK;
         }
@@ -166 +166 @@
         if (result > NETIF_NULL) {
                 int phone = device->nil_phone;
+                nil_device_state_msg(phone, device_id, result);
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                nil_device_state_msg(phone, device_id, result);
                 return EOK;
         }