Changeset c028b22 in mainline for uspace/lib/net/include/netif_skel.h

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/include/netif_skel.h (modified) (3 diffs)

uspace/lib/net/include/netif_skel.h

@@ -39 +39 @@
 #define NET_NETIF_SKEL_H_
 
-#include <async.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
-
 #include <adt/measured_strings.h>
 #include <net/device.h>
 #include <net/packet.h>
+#include <async.h>
 
 /** Network interface device specific data. */
 typedef struct {
-        device_id_t device_id;  /**< Device identifier. */
-        int nil_phone;          /**< Receiving network interface layer phone. */
-        device_state_t state;   /**< Actual device state. */
-        void *specific;         /**< Driver specific data. */
+        device_id_t device_id;   /**< Device identifier. */
+        device_state_t state;    /**< Actual device state. */
+        void *specific;          /**< Driver specific data. */
 } netif_device_t;
 
@@ -65 +63 @@
 /** Network interface module skeleton global data. */
 typedef struct {
-        int net_phone;                  /**< Networking module phone. */
+        async_sess_t *sess;             /**< Networking module session. */
+        async_sess_t *nil_sess;         /**< Network interface layer session. */
         netif_device_map_t device_map;  /**< Device map. */
         fibril_rwlock_t lock;           /**< Safety lock. */
@@ -127 +126 @@
  * @return Other error codes as defined for the specific module
  *         message implementation.
- 
  *
  */